summaryrefslogtreecommitdiff
path: root/plugins/composer
diff options
context:
space:
mode:
authorTuowen Zhao <ztuowen@gmail.com>2018-09-10 10:50:45 -0600
committerTuowen Zhao <ztuowen@gmail.com>2018-09-10 10:50:45 -0600
commit5ece6ef2f07c58672a9c965dbbbb62a42386fb2d (patch)
tree285e6382f9e900779bce60da02f1f0d97e467e26 /plugins/composer
parent852e7fe005267f74f3c04a4ddbb310522eee8014 (diff)
parentfe5fe81c8cfa66981c51d149a35fe545f2ef5016 (diff)
downloadzsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.tar.gz
zsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.tar.bz2
zsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/composer')
-rw-r--r--plugins/composer/composer.plugin.zsh9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index d00813e39..634961023 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -51,5 +51,10 @@ alias cgrm='composer global remove'
# install composer in the current directory
alias cget='curl -s https://getcomposer.org/installer | php'
-# Add Composer's global binaries to PATH
-export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
+# Add Composer's global binaries to PATH, using Composer if available.
+if (( $+commands[composer] )); then
+ export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
+else
+ [ -d $HOME/.composer/vendor/bin ] && export PATH=$PATH:$HOME/.composer/vendor/bin
+ [ -d $HOME/.config/composer/vendor/bin ] && export PATH=$PATH:$HOME/.config/composer/vendor/bin
+fi