Permalink
Browse files

Cleaned up install script output.

Removed the .sh extensions.
  • Loading branch information...
1 parent 09aabe9 commit f4963f9faf6a7f7d67208a73f4975bb12d25f79d @labisso labisso committed Mar 23, 2010
Showing with 59 additions and 20 deletions.
  1. +35 −14 bin/{create-nimbus-home.sh → create-nimbus-home}
  2. +24 −6 bin/{install.sh → install}
@@ -27,14 +27,39 @@ if [ "X$1" == "X" ]; then
exit 1
fi
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Preparing Nimbus installation directory"
+echo "-----------------------------------------------------------------"
+echo ""
+# first ensure we have a GT tarball. Most likely it has been bundled with
+# the Nimbus installer.
+if [ ! -f $TMPDIR/$CONTAINER_TARNAME ]; then
+ echo "Downloading service container.."
+ echo ""
+ wget -c -O $TMPDIR/$CONTAINER_TARNAME $CONTAINER_URL
+
+ if [ $? -ne 0 ]; then
+ echo ""
+ echo "Failed to download container tarball from: $CONTAINER_URL"
+ echo ""
+ echo "If you are unable to access the Internet, please retrieve this"
+ echo "file by other means and place it in $TMPDIR/."
+ echo "Then rerun this script."
+
+ rm -f $TMPDIR/$CONTAINER_TARNAME
+
+ exit 1
+ fi
+fi
+
NIMBUS_HOME=$1
if [ ! -d $NIMBUS_HOME ]; then
PARENT_DIR=`dirname $NIMBUS_HOME`
if [ -d $PARENT_DIR ]; then
- echo "Creating destination directory: $NIMBUS_HOME"
mkdir $NIMBUS_HOME
if [ $? -ne 0 ]; then
@@ -64,21 +89,12 @@ fi
CONTAINER_DIR="$NIMBUS_HOME/$CONTAINER_DIRNAME"
if [ ! -d $CONTAINER_DIR ]; then
- echo "Downloading and installing service container.."
-
- # fetch GT container if it doesn't already exist
- if [ ! -f $TMPDIR/$CONTAINER_TARNAME ]; then
- wget -c -O $TMPDIR/$CONTAINER_TARNAME $CONTAINER_URL
-
- if [ $? -ne 0 ]; then
- echo "Failed to download container tarball"
- exit 1
- fi
- fi
+ echo "Installing service container.."
tar xzf $TMPDIR/$CONTAINER_TARNAME -C $TMPDIR
if [ $? -ne 0 ]; then
- echo "Failed to expand Nimbus tarball"
+ echo "Failed to expand container tarball: $TMPDIR/$CONTAINER_TARNAME"
+ echo "If this file is corrupted, you may delete it and rerun this script to download a new one."
exit 1
fi
@@ -91,7 +107,10 @@ else
echo "Service container already exists at $CONTAINER_DIR"
fi
-echo "Building and installing Nimbus to service container.."
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Building and installing Nimbus services"
+echo "-----------------------------------------------------------------"
GLOBUS_LOCATION=$CONTAINER_DIR
export GLOBUS_LOCATION
@@ -101,3 +120,5 @@ if [ $? -ne 0 ]; then
echo "Build and install FAILED!"
exit 1
fi
+
+echo ""
@@ -33,13 +33,19 @@ if [ -d $NIMBUS_HOME ] && [ "$(ls -A $NIMBUS_HOME)" ]; then
fi
fi
-$NIMBUS_SRC/bin/create-nimbus-home.sh $NIMBUS_HOME
+$NIMBUS_SRC/bin/create-nimbus-home $NIMBUS_HOME
if [ $? -ne 0 ]; then
- echo "Nimbus home creation failed!"
+ echo ""
+ echo "Nimbus home directory creation failed!"
exit 1
fi
+echo "-----------------------------------------------------------------"
+echo " Configuring installed services"
+echo "-----------------------------------------------------------------"
+echo ""
+
CONFIG_SCRIPT="$NIMBUS_HOME/bin/nimbus-configure"
if [ ! -f $CONFIG_SCRIPT ]; then
@@ -56,11 +62,23 @@ if [ $? -ne 0 ]; then
fi
echo ""
-echo "Nimbus installation succeeded!"
-echo "However, additional configuration may be necessary."
-echo "Refer to the Administrator Guide for details."
+echo "-----------------------------------------------------------------"
+echo " Nimbus installation succeeded!"
+echo "-----------------------------------------------------------------"
+echo ""
+echo "However, additional configuration may be necessary:"
+echo ""
+echo " To run the auto-configuration program, launch:"
+echo " $NIMBUS_HOME/services/share/nimbus-autoconfig/autoconfig.sh"
+echo ""
+echo " To run the cloud configuration admin helper, launch:"
+echo " $NIMBUS_HOME/services/share/nimbus-autoconfig/cloud-admin.sh"
+echo ""
+
+echo "Refer to the Administrator Guide for details:"
+echo " http://www.nimbusproject.org/docs/"
echo ""
-echo "You can now start/stop Nimbus services with the nimbusctl command. e.g:"
+echo "You can start/stop Nimbus services with the nimbusctl command. e.g:"
echo " $NIMBUS_HOME/bin/nimbusctl start"
echo ""

0 comments on commit f4963f9

Please sign in to comment.