diff options
| author | Julian C. Dunn <jdunn@chef.io> | 2015-03-26 13:04:38 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@chef.io> | 2015-04-20 15:31:31 -0400 |
| commit | d020f55ae5dc000e027d94119ffafb0e9328d1fc (patch) | |
| tree | c1012445a9359d9ce85cb59622fc69ebb7f38767 | |
| parent | 71a03417bd5a9b7b4520693cbb494e325ec8fef2 (diff) | |
| download | chef-d020f55ae5dc000e027d94119ffafb0e9328d1fc.tar.gz | |
Address review comment https://github.com/chef/chef/pull/2877#discussion_r26357870
| -rw-r--r-- | lib/chef/knife/bootstrap/templates/chef-full.erb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/chef/knife/bootstrap/templates/chef-full.erb b/lib/chef/knife/bootstrap/templates/chef-full.erb index c65cfaf725..157980a9ac 100644 --- a/lib/chef/knife/bootstrap/templates/chef-full.erb +++ b/lib/chef/knife/bootstrap/templates/chef-full.erb @@ -11,24 +11,6 @@ fi tmp_dir="$tmp/install.sh.$$" (umask 077 && mkdir $tmp_dir) || exit 1 -# @param $1 the omnibus root directory -# @param $2 the requested version of omnibus package -# @return 0 if omnibus needs to be installed, non-zero otherwise -should_update_chef() { - if test ! -d "$1" ; then return 0 - elif test ! -f "$1/bin/chef-client" ; then return 0 - elif test "$2" = "true" ; then return 1 - elif test "$2" = "latest" ; then return 0 - fi - - local version="`$1/bin/chef-client -v | cut -d " " -f 2`" - if echo "$version" | grep "^$2" 2>&1 >/dev/null; then - return 1 - else - return 0 - fi -} - exists() { if command -v $1 &>/dev/null then |