Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Fix quoting for echo command
Browse files Browse the repository at this point in the history
  • Loading branch information
seanf committed Sep 21, 2011
1 parent ca2944c commit 74f4bf4
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions server/zanata-war/etc/scripts/zanata-deploy.sh
Expand Up @@ -58,7 +58,7 @@ die() {
arrayGet() {
local array=$1 index=$2
local i="${array}_${index}"
echo ${!i}
echo "${!i}"
}

warn() {
Expand Down Expand Up @@ -94,8 +94,8 @@ else
version=$branch_name
fi

echo branch: $branch_name
echo version: $version
echo "branch: $branch_name"
echo "version: $version"

# replace . with _ in version:
ver=${version//./_}
Expand Down Expand Up @@ -141,15 +141,15 @@ do
fi


echo host: $host
echo url: $url
echo user: $user
echo service: $service
echo targetfile: $targetfile
echo logfile: $logfile
echo "host: $host"
echo "url: $url"
echo "user: $user"
echo "service: $service"
echo "targetfile: $targetfile"
echo "logfile: $logfile"

set -x
echo stopping app server on $host:
echo "stopping app server on $host:"
if ! $ssh $user@$host $service stop
then echo "$server stop failed (server not running?); ignoring error"
fi
Expand All @@ -158,17 +158,17 @@ do
warfile=server/zanata-war/target/zanata-*-$buildType.war

set -x
echo copying $warfile to $host:$targetfile
echo "copying $warfile to $host:$targetfile"
$scp $warfile $user@$host:$targetfile
echo starting app server on $host
echo "starting app server on $host"
$ssh $user@$host $service start
set +x

if $DIR/is_server_up.sh $url ; then
echo $url has started up; log tail follows:
echo "$url has started up; log tail follows:"
ssh $user@$host tail $logfile
else
echo $url has failed to start; log tail follows:
echo "$url has failed to start; log tail follows:"
ssh $user@$host tail -400 $logfile
exit 1
fi
Expand Down

0 comments on commit 74f4bf4

Please sign in to comment.