Update deploy.sh

Echo strings updated with formal language.

Author: a37k

deploy.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
     stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
-    echo "try to test stest_server network"
+    echo "Trying to connect to stest_server network"
     timeout 10 ping -c 5  47.93.42.145 > /dev/null || exit 1
     timeout 10 ping -c 5  47.93.18.60  > /dev/null || exit 1
-    echo "stest_server network good"
+    echo "Successfully connected to stest_server network"
     stest_server=""
     docker_num_in_145=`ssh -p 22008 -t java-tron@47.93.42.145 'docker ps -a | wc -l'`
     docker_num_in_145=`echo $docker_num_in_145 | tr -d "\r"`
@@ -28,22 +28,22 @@ if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
 
     if [ "$stest_server" = "" ]
     then
-    echo "All docker server is busy, stest FAILED"
+    echo "All docker servers are busy, stest FAILED"
     exit 1
     fi
 
     change_branch_CMD="sed -i '1c branch_name_in_CI=$TRAVIS_BRANCH' /data/workspace/docker_workspace/do_stest.sh"
 
-    echo "Init the docker stest env"
-    echo "'$stest_server' is stest server this time"
+    echo "Initialize the docker stest env"
+    echo "'$stest_server' is selected as stest server in this instance"
     ssh java-tron@$stest_server -p 22008 $change_branch_CMD
     `ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1` &
     sleep 300 && echo $TRAVIS_BRANCH &
     wait
     if [[ `find $stestlogname -type f | xargs grep "Connection refused"` =~ "Connection refused" || `find $stestlogname -type f | xargs grep "stest FAILED"` =~ "stest FAILED" ]];
     then
       rm -f $stestlogname
-      echo "first Retry stest task"
+      echo "Retrying stest task for the first time"
       ssh java-tron@$stest_server -p 22008 $change_branch_CMD
       `ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1` &
       sleep 300 && echo $TRAVIS_BRANCH &
@@ -52,13 +52,13 @@ if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
     if [[ `find $stestlogname -type f | xargs grep "Connection refused"` =~ "Connection refused" || `find $stestlogname -type f | xargs grep "stest FAILED"` =~ "stest FAILED" ]];
     then
       rm -f $stestlogname
-      echo "second Retry stest task"
+      echo "Retrying stest task for the second time"
       ssh java-tron@$stest_server -p 22008 $change_branch_CMD
       `ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1` &
       sleep 300 && echo $TRAVIS_BRANCH &
       wait
     fi
-    echo "stest start"
+    echo "Starting stest"
     cat $stestlogname | grep "Stest result is:" -A 10000
     echo "stest end"
 
@@ -71,7 +71,7 @@ if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
       exit 1
     fi
 fi
-echo "bye bye"
+echo "Closing"
 echo $stest_server
 rm -f $stestlogname
-exit 0
+exit 0