commit b150132c8fbfcbf3145fcb07ecce2488a0de36c1 Author: Runa A. Sandvik runa.sandvik@gmail.com Date: Sun Nov 13 11:40:37 2011 +0000

No need to chmod the file twice --- build.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh index 1d34eb5..29efa20 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,6 @@ export EC2_PRIVATE_KEY=/path/to/pk.cert export EC2_CERT=/path/to/cert.pem

- relaytype=$1; region=$2; sshkey=$3; @@ -43,7 +42,6 @@ else exit fi

- # get the associated AMI (amazon image) and AKI (amazon kernel) values for # the defined region & architecture. We only work with EBS instance types, as they are # elastic and easy to snapshot @@ -100,7 +98,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} u ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/ec2-prep.sh -O /mnt/src/etc/ec2-prep.sh"

# fix permissions -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo chmod +x /mnt/src/etc/ec2-prep.sh && sudo chmod +x /mnt/src/etc/ec2-prep.sh" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo chmod +x /mnt/src/etc/ec2-prep.sh"

# rsync the retrieved Ubuntu image to mounted Volume ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo rsync -aXHAS /mnt/src/ /mnt/target"