diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
| commit | 741388be00fb88b7680e0faa328adf5a86e1f65f (patch) | |
| tree | 5e53a65fcc71bc01c5f81b28fb5e54faaf3ab2a8 /plugins/autojump | |
| parent | 37266112759a5759536cc4ea84ea063695cd1f2e (diff) | |
| parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
| download | zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.gz zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.bz2 zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.zip | |
Merge remote branch 'upstream/master'
Conflicts:
lib/completion.zsh
Diffstat (limited to 'plugins/autojump')
| -rw-r--r-- | plugins/autojump/autojump.plugin.zsh | 12 |
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 |