Installer improvements: improved error checking in deploy.sh and inst…

…all/shipbuilder.sh.

deploy.go

@@ -81,12 +81,15 @@ EOF
     sudo service shipbuilder stop
     echo 'info: starting service'
     sudo service shipbuilder start
+    exitCode=0
 
 else
     echo 'error: build failed, operation aborted'
+    exitCode=1
 fi
 sudo rm -f '` + COMPRESSED_PATH + `' '` + DEPLOYER_SCRIPT_PATH + `'
-sudo rm -rf /tmp/build`
+sudo rm -rf /tmp/build
+exit $exitCode`
 )
 
 func getLdFlags() string {

deploy.sh

@@ -15,3 +15,5 @@ test -z "$(which envdir)" && echo 'fatal: no "envdir" binary found, make sure da
 test ! -d './env' && echo 'fatal: missing "env" configuration directory, see "Compilation" in the README' 1>&2 && exit 1
 
 envdir env go run deploy.go $*
+# Preserve exit status code.
+exit $?

install/libfns.sh

@@ -450,7 +450,7 @@ function prepareLoadBalancer() {
 
 function installGo() {
     if [ -z "$(which go)" ]; then
-        echo 'info: installing go 1.1 on the build-server'
+        echo 'info: installing go v1.1 on the build-server'
         curl --location --silent https://launchpad.net/ubuntu/+archive/primary/+files/golang-src_1.1-1_amd64.deb > /tmp/golang-src_1.1-1_amd64.deb
         abortIfNonZero $? 'golang-src package download'
         curl --location --silent https://launchpad.net/ubuntu/+archive/primary/+files/golang-go_1.1-1_amd64.deb > /tmp/golang-go_1.1-1_amd64.deb

install/shipbuilder.sh

@@ -82,6 +82,7 @@ elif [ "${action}" = "install" ]; then
     mv ../env/SB_SSH_HOST{,.bak}
     echo "${sbHost}" > ../env/SB_SSH_HOST
     ../deploy.sh
+    abortIfNonZero $? 'ShipBuilder deployment via deploy.sh failed'
     mv ../env/SB_SSH_HOST{.bak,}
 
     ssh -o 'BatchMode yes' -o 'StrictHostKeyChecking no' $sbHost "source /tmp/libfns.sh && prepareServerPart2 ${lxcFs}"