diff options
| author | Peter Tillemans <pti@snamellit.com> | 2013-01-02 09:42:14 +0100 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2013-01-02 09:42:14 +0100 |
| commit | 587832f15579398e54690e62ea588178e951f8f8 (patch) | |
| tree | 1e2149e743710e2c72a567a042606333bbad88da /plugins/knife | |
| parent | 55cc936d4e6d88f18518cedc9574b1df10702f8b (diff) | |
| parent | 80a603259657acab97badbae20003b5a34c901f9 (diff) | |
| download | zsh-587832f15579398e54690e62ea588178e951f8f8.tar.gz zsh-587832f15579398e54690e62ea588178e951f8f8.tar.bz2 zsh-587832f15579398e54690e62ea588178e951f8f8.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-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 |