diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-08-31 13:29:54 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 12:50:55 -0400 |
| commit | 82c76f6b5c2718622a532fb759231e8d24171413 (patch) | |
| tree | b0126f6d9b3ed508c1a6d9b21df56e2523e0555f /plugins/autojump/autojump.plugin.zsh | |
| parent | fe92ea98e0633784508e85d6b756b1c3f667b2a4 (diff) | |
| parent | ba5fd57c1ff4a8523715bab6acc35dbbeff88af7 (diff) | |
| download | zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.gz zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.bz2 zsh-82c76f6b5c2718622a532fb759231e8d24171413.zip | |
Merge changes from #4241 into installer-portable-colors
Conflicts:
tools/install.sh
tools/upgrade.sh
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 |