diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
| commit | 2595484a97d85496fdcdca99a23f52eecd9b1b43 (patch) | |
| tree | fffe23d53a2a635f0861047fb058c8a2632414f7 /plugins/knife | |
| parent | 8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (diff) | |
| parent | 6e6cf4303712befb5a7fc3918494aefe4a65991f (diff) | |
| download | zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.gz zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.bz2 zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
lib/aliases.zsh
Diffstat (limited to 'plugins/knife')
| -rw-r--r-- | plugins/knife/_knife | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/knife/_knife b/plugins/knife/_knife index 8453af5be..dec491257 100644 --- a/plugins/knife/_knife +++ b/plugins/knife/_knife @@ -170,7 +170,11 @@ _chef_environments_remote() { # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server _chef_cookbooks_local() { - (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done) + local knife_rb="$HOME/.chef/knife.rb" + if [ -f ./.chef/knife.rb ]; then + knife_rb="./.chef/knife.rb" + fi + (for i in $( grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done) } # This function extracts the available cookbook versions on the chef server |