diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
| commit | 96ff86142e9037e707f9cde8ab69e0425a0559c6 (patch) | |
| tree | 217cb5e2b4a1c55afec79984c3c3c0a9efe2bf69 /plugins/autojump | |
| parent | 502f08b5e19716d43a7ec8b006178a7b017f68cd (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.gz zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.bz2 zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.zip | |
Merge branch 'master' into installer-cygwin-support-3
Conflicts:
tools/install.sh
Diffstat (limited to 'plugins/autojump')
| -rw-r--r-- | plugins/autojump/autojump.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 4cf036401..c05c699e1 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -15,7 +15,7 @@ if [ $commands[autojump] ]; then # check if autojump is installed . /usr/local/share/autojump/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 + elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew + . `brew --prefix`/etc/autojump.sh fi fi |