]> gitweb.fluxo.info Git - leap/leap_cli.git/commitdiff
only install compatible sahara vagrant plugin version
authorelijah <elijah@riseup.net>
Fri, 16 Aug 2013 08:38:54 +0000 (01:38 -0700)
committerelijah <elijah@riseup.net>
Fri, 16 Aug 2013 08:38:54 +0000 (01:38 -0700)
lib/leap_cli/commands/vagrant.rb

index 7720648c138a94adcf7597d53d68c4bc7a9f5091..e674c755a3b8c2b08d938ab6fa8c88e1000c03b9 100644 (file)
@@ -114,9 +114,11 @@ module LeapCli; module Commands
     version = vagrant_version
     case version
       when 0..1
-        unless assert_run!('vagrant gem which sahara').chars.any?
+        gem_path = assert_run!('vagrant gem which sahara')
+        if gem_path.nil? || gem_path.empty? || gem_path =~ /^ERROR/
           log :installing, "vagrant plugin 'sahara'"
-          assert_run! 'vagrant gem install sahara'
+          assert_run! 'vagrant gem install sahara -v 0.0.13'
+          # (sahara versions above 0.0.13 require vagrant > 1.0)
         end
       when 2
         unless assert_run!('vagrant plugin list | grep sahara | cat').chars.any?