diff options
author | Max Masnick <max@masnick.me> | 2012-02-25 16:15:40 -0500 |
---|---|---|
committer | Max Masnick <max@masnick.me> | 2012-02-25 16:15:40 -0500 |
commit | 7441438afa9f96ff1d39a6cd0d8692c2b9044bf2 (patch) | |
tree | 508d195705e63c5baff4ed9ead765744feec323f /plugins/autojump/autojump.plugin.zsh | |
parent | 9e3776f1ecbaa29d646cdfe8fc204597ca98746c (diff) | |
parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
download | zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.gz zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.bz2 zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.zip |
merge changes from offical repo
Diffstat (limited to 'plugins/autojump/autojump.plugin.zsh')
-rw-r--r-- | plugins/autojump/autojump.plugin.zsh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index da0a12765..6f0edb062 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -1,3 +1,9 @@ -if [ -f `brew --prefix`/etc/autojump ]; then - . `brew --prefix`/etc/autojump +if [ $commands[autojump] ]; then # check if autojump is installed + if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package + . /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 + fi fi |