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