diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
| commit | 93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch) | |
| tree | 7cc87fcd416bf71cee77f30bf2e60cf607671f43 /plugins/autojump/autojump.plugin.zsh | |
| parent | 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff) | |
| parent | 0532860c618aabc02d5dab34391b967e8e4c6272 (diff) | |
| download | zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2 zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip | |
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
plugins/osx/osx.plugin.zsh
Diffstat (limited to 'plugins/autojump/autojump.plugin.zsh')
| -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 |