From 3353e2a3bdd04afe0bde2a80870d466a3044391b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 19 Aug 2015 17:09:46 +0300 Subject: [PATCH] use chef-client as test, not knife --- pld-chef-installed.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pld-chef-installed.patch b/pld-chef-installed.patch index 5a9635e..96f1667 100644 --- a/pld-chef-installed.patch +++ b/pld-chef-installed.patch @@ -19,18 +19,18 @@ + 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 -- 2.44.0