diff options
| author | Stephen Zhuang <stephen.zhuang@gmail.com> | 2013-01-06 14:10:42 +0800 |
|---|---|---|
| committer | Stephen Zhuang <stephen.zhuang@gmail.com> | 2013-01-06 14:10:42 +0800 |
| commit | 914c47b3473b000288c693523f83fde998282a81 (patch) | |
| tree | a29cf3d796544a3b2807e26812011cda51f644a9 /plugins/knife/_knife | |
| parent | 692dca07158413ae27b2064c303240f5b9621cff (diff) | |
| parent | 80a603259657acab97badbae20003b5a34c901f9 (diff) | |
| download | zsh-914c47b3473b000288c693523f83fde998282a81.tar.gz zsh-914c47b3473b000288c693523f83fde998282a81.tar.bz2 zsh-914c47b3473b000288c693523f83fde998282a81.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/knife/_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 |