From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 8 Nov 2012 20:33:05 +0000 (+0100)
Subject: again, mildy improve output
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=ec6e5323d63a16039663ffebd20d83a314d1b0f7;p=profitbricks%2Fjenkins-build-scripts.git

again, mildy improve output
---

diff --git a/liveboot_testdeploy.sh b/liveboot_testdeploy.sh
index d54b27c..d286003 100755
--- a/liveboot_testdeploy.sh
+++ b/liveboot_testdeploy.sh
@@ -67,6 +67,7 @@ if $(ping -c 1 $TESTSERVER >/dev/null)  ; then
 	echo "$TESTSERVER responds to pings, even though it was reset 3secs ago, this should not happen, please investigate manually."
 	exit 1
 fi
+echo
 
 #
 # check for 10min whether it's booting up again
@@ -76,8 +77,7 @@ for i in $(seq 1 60) ; do
 	sleep 10
 	echo -n "$(date +%H:%M:%S): "
 	if $(ping -c 1 $TESTSERVER >/dev/null)  ; then
-		echo
-		echo "$(date +%H:%M:%S): ICMP echo reply from $TESTSERVER, so let's assume it's booting now."
+		echo "ICMP echo reply from $TESTSERVER, so let's assume it's booting now."
 		break
 	fi
 	echo "no ICMP echo reply received."
@@ -87,6 +87,7 @@ if ! $(ping -c 1 $TESTSERVER >/dev/null) ; then
 	echo "$TESTSERVER still down, please investigate."
 	exit 1
 fi
+echo
 
 #
 # check for 15min whether ssh comes back
@@ -101,7 +102,7 @@ for i in $(seq 1 90) ; do
 			echo "ok, sshd is running at $(date +%H:%M:%S)"
 			break
 		else
-			echo "but sshd is not running at date $(date +%H:%M:%S)"
+			echo "but sshd is not running at $(date +%H:%M:%S)"
 		fi
 	fi
 done
@@ -110,6 +111,7 @@ if ! $(nc -z $TESTSERVER 22 ) ; then
 	echo "$TESTSERVER still not running sshd, please investigate."
 	exit 1
 fi
+echo
 
 #
 # send announce mail
@@ -120,7 +122,7 @@ if [ ! -e $MAIL ] ; then
 	echo "$MAIL does not exist, something wrong with liveboot-web?"
 	exit 1
 fi
-head -42 $MAIL
+head -33 $MAIL
 cat $MAIL | /usr/sbin/sendmail $MAILTO
 echo
 echo "Ok, mail to $MAILTO send."