Skip to content
Browse files

install output cleanup/normalization

  • Loading branch information...
1 parent 57240f5 commit f7b03a59787e909643d28e07c11f9533c42ce617 @timf timf committed
Showing with 28 additions and 21 deletions.
  1. +19 −15 cumulus/cumulus-install.sh
  2. +7 −5 install
  3. +2 −1 libexec/install-real.sh
View
34 cumulus/cumulus-install.sh
@@ -36,9 +36,8 @@ if [ "X$2" == "X" ]; then
mv $installdir $bkup_dir
fi
- echo "====================================="
- echo "Making the python virtual env for cumulus"
- echo "====================================="
+ echo "Making the Python virtual environment."
+ echo ""
$PYTHON $source_dir/virtualenv.py -p $PYTHON $installdir
if [ $? -ne 0 ]; then
echo "The virtural env installation failed"
@@ -50,9 +49,8 @@ if [ "X$2" == "X" ]; then
PIP=$installdir/bin/pip
else
use_py=$2
- echo "====================================="
- echo "Using the provided python $use_py"
- echo "====================================="
+ echo "Using provided Python environment: $use_py"
+ echo ""
PYVEDIR=$use_py
PYVE=$use_py/bin/python
@@ -95,16 +93,18 @@ if [ $? -ne 0 ]; then
echo "Could not change to the deps directory"
exit 1
fi
-pwd
+
./get-em.sh
if [ $? -ne 0 ]; then
echo "get-em failed"
exit 1
fi
-echo "====================================="
-echo "Installing the dependencies"
-echo "====================================="
+echo ""
+echo "-----------------------------------------------------------------"
+echo "Installing Cumulus dependencies"
+echo "-----------------------------------------------------------------"
+echo ""
# install deps
cd $source_dir
$PIP install --requirement=reqs.txt
@@ -113,9 +113,11 @@ if [ $? -ne 0 ]; then
exit 1
fi
-echo "====================================="
+echo ""
+echo "-----------------------------------------------------------------"
echo "Configuring the environment"
-echo "====================================="
+echo "-----------------------------------------------------------------"
+echo ""
cd $source_dir/conf
./configure --prefix=$installdir --with-ve=$PYVEDIR
if [ $? -ne 0 ]; then
@@ -128,9 +130,11 @@ if [ $? -ne 0 ]; then
exit 1
fi
-echo "====================================="
-echo "Final copies"
-echo "====================================="
+echo ""
+echo "-----------------------------------------------------------------"
+echo "Finalizing the Cumulus install"
+echo "-----------------------------------------------------------------"
+echo ""
cd $source_dir
cp -r $source_dir/tests $installdir
cp -r $source_dir/docs $installdir
View
12 install
@@ -2,7 +2,7 @@
FORCE_FRESH_INSTALL="yes"
-NIMBUS_SRC_REL="`dirname $0`/."
+NIMBUS_SRC_REL="`dirname $0`"
NIMBUS_SRC=`cd $NIMBUS_SRC_REL; pwd`
if [ "X$1" = "X" ]; then
@@ -73,9 +73,11 @@ if [ $? -ne 0 ]; then
exit 1
fi
-echo "=====================================" | tee -a $NIMBUS_HOME/install.log
-echo "Making the Python virtual env" | tee -a $NIMBUS_HOME/install.log
-echo "=====================================" | tee -a $NIMBUS_HOME/install.log
+echo ""
+echo "-----------------------------------------------------------------" | tee -a $NIMBUS_HOME/install.log
+echo "Making the Python virtual environment" | tee -a $NIMBUS_HOME/install.log
+echo "-----------------------------------------------------------------" | tee -a $NIMBUS_HOME/install.log
+echo ""
pyve_path=$NIMBUS_HOME/ve
echo "Installing from $NIMBUS_SRC"
@@ -101,10 +103,10 @@ if [ ! -f $CUMULUS_ENV ]; then
exit 1
fi
+echo ""
echo "-----------------------------------------------------------------"
echo " Configuring installed services"
echo "-----------------------------------------------------------------"
-echo ""
CONFIG_SCRIPT="$NIMBUS_HOME/bin/nimbus-configure"
View
3 libexec/install-real.sh
@@ -49,11 +49,12 @@ if [ $? -ne 0 ]; then
exit 1
fi
-$REPOCMD2
+$REPOCMD2 >/dev/null
if [ $? -ne 0 ]; then
echo "Could not create Cumulus repository."
exit 1
fi
+echo "Created repo admin."
$REPOCMD3
if [ $? -ne 0 ]; then

0 comments on commit f7b03a5

Please sign in to comment.
Something went wrong with that request. Please try again.