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/autojump/autojump.plugin.zsh | |
| 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/autojump/autojump.plugin.zsh')
| -rw-r--r-- | plugins/autojump/autojump.plugin.zsh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 6f0edb062..3894ccd2f 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -3,7 +3,11 @@ 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 [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew - . `brew --prefix`/etc/autojump + 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 + . `brew --prefix`/etc/autojump.zsh fi fi |