composer: Fix bin directory when Composer is not available (#6240)
* Fix for Composer's bin when Composer isn't global
When Composer isn't globally installed, the `composer global` call results in an error. This checks to see if Composer is available before making the call. When Composer isn't available, it will just manually set the directories.
* Fix Composer brackets in global bin directory
* composer: Apply feedback from ricpelo
This applies ricpelo's feedback at https://github.com/robbyrussell/oh-my-zsh/pull/6240#pullrequestreview-64253321
* composer: Fix path check syntax
* composer: test with $commands[] syntax
Diff
1diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
2index d00813e39d66701381c84ab156377c6ece59fb10..634961023fa2ff4e6eac72df5ce64b0fc5ae880a 100644
3--- a/plugins/composer/composer.plugin.zsh
4+++ b/plugins/composer/composer.plugin.zsh
5@@ -51,5 +51,10 @@ alias cgrm='composer global remove'
6 # install composer in the current directory
7 alias cget='curl -s https://getcomposer.org/installer | php'
8 9-# Add Composer's global binaries to PATH
10-export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
11+# Add Composer's global binaries to PATH, using Composer if available.
12+if (( $+commands[composer] )); then
13+ export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
14+else
15+ [ -d $HOME/.composer/vendor/bin ] && export PATH=$PATH:$HOME/.composer/vendor/bin
16+ [ -d $HOME/.config/composer/vendor/bin ] && export PATH=$PATH:$HOME/.config/composer/vendor/bin
17+fi