]> git.pld-linux.org Git - packages/vagrant.git/commitdiff
use chef-client as test, not knife
authorElan Ruusamäe <glen@delfi.ee>
Wed, 19 Aug 2015 14:09:46 +0000 (17:09 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 19 Aug 2015 14:25:23 +0000 (17:25 +0300)
pld-chef-installed.patch

index 5a9635e463ceba454ddefae30b6f7a52d54e69cd..96f16675ac503899867d421c70e228f34efeaaf7 100644 (file)
 +  module Chef
 +    module Cap
 +      module PLD
-+        module ChefInstalled 
++        module ChefInstalled
 +          # Check if Chef is installed at the given version.
 +          # @return [true, false]
 +          def self.chef_installed(machine, version)
-+            knife = "/usr/bin/knife"
++            knife = "/usr/bin/chef-client"
 +            command = "test -x #{knife}"
-+            
++
 +            if version != :latest
 +              command << "&& #{knife} --version | grep 'Chef: #{version}'"
 +            end
 +
-+            machine.communicate.test(command, sudo: true)         
++            machine.communicate.test(command, sudo: true)
 +          end
 +        end
 +      end
This page took 0.100763 seconds and 4 git commands to generate.