Permalink
Browse files

upgrade 1.9.2 to p290

  • Loading branch information...
1 parent fad761d commit ef7e4ed7b4ae554246cbf52d0ab7d831132e251f @gurgeous gurgeous committed Aug 16, 2011
Showing with 7 additions and 6 deletions.
  1. +1 −1 lib/teleport/run.sh
  2. +1 −1 spec/end_to_end_spec.rb
  3. +5 −4 spec/support/ec2.rb
View
@@ -48,7 +48,7 @@ function install_ruby_187() {
}
function install_ruby_192() {
- local patch=p180
+ local patch=p290
# see http://threebrothers.org/brendan/blog/ruby-1-9-2-on-ubuntu-11-04/
sudo apt-get install -y bison build-essential checkinstall libffi5 libssl-dev libyaml-dev zlib1g-dev
View
@@ -7,7 +7,7 @@
telfile do
<<EOF
user "gub"
-ruby "1.8.7"
+ruby "1.9.2"
ssh_options ["-o", "User=ubuntu", "-o", "StrictHostKeyChecking=no", "-o", "IdentityFile=#{ENV["TELEPORT_SSH_KEY"]}"]
role :master, :packages => %w(nginx)
View
@@ -76,10 +76,11 @@ def start
puts "Waiting for ec2 instance to start..."
while true
sleep 3
- instance = describe_instances.first
- status = instance["instanceState"]["name"]
- puts " #{instance["instanceId"]}: #{status}"
- break if status == "running"
+ if instance = describe_instances.first
+ status = instance["instanceState"]["name"]
+ puts " #{instance["instanceId"]}: #{status}"
+ break if status == "running"
+ end
end
# return the ip address

0 comments on commit ef7e4ed

Please sign in to comment.