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

Commit

Permalink
tabs -> spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Oct 15, 2015
1 parent 5ddad20 commit 2345c4b
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions setup-slave.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ cd `dirname $0`

if [ "$1" = "--manual" ]
then
echo "Enter slave name: "
read SLAVENAME
echo "Enter slave password: "
read PASSWORD
echo "Enter master address: "
read MASTER_ADDY
echo "Enter slave name: "
read SLAVENAME
echo "Enter slave password: "
read PASSWORD
echo "Enter master address: "
read MASTER_ADDY
else
# Some images take time for the user data to appear
sleep 1
echo "Guessing we are on EC2, reading user-data"
read SLAVENAME PASSWORD MASTER_ADDY <<EOF
# Some images take time for the user data to appear
sleep 1
echo "Guessing we are on EC2, reading user-data"
read SLAVENAME PASSWORD MASTER_ADDY <<EOF
`curl -s http://169.254.169.254/latest/user-data`
EOF
fi
Expand All @@ -29,27 +29,27 @@ cp rust-buildbot-slave-stunnel.conf rust-buildbot-slave-stunnel-final.conf
echo "connect = ${MASTER_ADDY:?}" >> rust-buildbot-slave-stunnel-final.conf

case $MACHTYPE in
*-msys)
# strip out a line that doesn't work on windows
cat rust-buildbot-slave-stunnel-final.conf | sed 's/pid =//' > stunnel-tmp.conf && mv stunnel-tmp.conf rust-buildbot-slave-stunnel-final.conf
cp rust-buildbot-slave-stunnel-final.conf "/c/Program Files (x86)/stunnel/stunnel.conf"
net start stunnel
net start buildbot
;;
*)
echo "starting stunnel..."
for s in stunnel4 stunnel
do
if which $s
then
$s rust-buildbot-slave-stunnel-final.conf || echo "stunnel startup failed, already running?"
fi
done
echo "starting slave..."
if [ "$NODAEMON" = "1" ]; then
buildslave restart --nodaemon slave
else
buildslave restart slave
fi
;;
*-msys)
# strip out a line that doesn't work on windows
cat rust-buildbot-slave-stunnel-final.conf | sed 's/pid =//' > stunnel-tmp.conf && mv stunnel-tmp.conf rust-buildbot-slave-stunnel-final.conf
cp rust-buildbot-slave-stunnel-final.conf "/c/Program Files (x86)/stunnel/stunnel.conf"
net start stunnel
net start buildbot
;;
*)
echo "starting stunnel..."
for s in stunnel4 stunnel
do
if which $s
then
$s rust-buildbot-slave-stunnel-final.conf || echo "stunnel startup failed, already running?"
fi
done
echo "starting slave..."
if [ "$NODAEMON" = "1" ]; then
buildslave restart --nodaemon slave
else
buildslave restart slave
fi
;;
esac

0 comments on commit 2345c4b

Please sign in to comment.