summaryrefslogtreecommitdiff
path: root/plugins/autojump
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-01-22 13:09:59 -0800
committerRobby Russell <robby@planetargon.com>2012-01-22 13:09:59 -0800
commit3891c50923955f2c8605c26dd958ccf65c685d0f (patch)
tree3c923728f080ba159a8489ff1107b9295d0e93d7 /plugins/autojump
parent3574f30d1ae3fbafacf8ab9d785d2252c52f4975 (diff)
parent5809a4721dd1b575c1f4cbc3cc361520e97cd8b9 (diff)
downloadzsh-3891c50923955f2c8605c26dd958ccf65c685d0f.tar.gz
zsh-3891c50923955f2c8605c26dd958ccf65c685d0f.tar.bz2
zsh-3891c50923955f2c8605c26dd958ccf65c685d0f.zip
Merge pull request #801 from kalos/autojump
autojump plugin enhanced
Diffstat (limited to 'plugins/autojump')
-rw-r--r--plugins/autojump/autojump.plugin.zsh12
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 6f9b80bff..6f0edb062 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,5 +1,9 @@
-if [ -f /opt/local/etc/profile.d/autojump.sh ]; then
- . /opt/local/etc/profile.d/autojump.sh
-elif [ -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