summaryrefslogtreecommitdiff
path: root/plugins/autojump
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-12-02 13:08:12 -0800
committerRobby Russell <robby@planetargon.com>2012-12-02 13:08:12 -0800
commit13998bb2cc12d11c16728e4b1db0d2a326ca6607 (patch)
treebe33357226ee8e01358762e66e4ac3961fd6a7f7 /plugins/autojump
parentdfbafe6d58bf1463df393fd4478154be36a675aa (diff)
parentfcc8b19253136e0f8d18d8e830c60ec64c6cc3e0 (diff)
downloadzsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.tar.gz
zsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.tar.bz2
zsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.zip
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/autojump')
-rw-r--r--plugins/autojump/autojump.plugin.zsh2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index fdce3a246..3894ccd2f 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -3,6 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
. /usr/share/autojump/autojump.zsh
elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
. /etc/profile.d/autojump.zsh
+ elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
+ . $HOME/.autojump/etc/profile.d/autojump.zsh
elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
. /opt/local/etc/profile.d/autojump.zsh
elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew