summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2014-12-19 20:26:08 -0800
committerRobby Russell <robby@planetargon.com>2014-12-19 20:26:08 -0800
commitdc9af89669135a61d306c34caf0a55ab9be1f6ea (patch)
tree47488ff0891e8dd98d22a0b70e7bb78e821dd758
parent9b352030b7fd1bcb6ecf2998bada1eef825de1a2 (diff)
parenta19d1d1f05281fc286991ff85010d6d431ae1d58 (diff)
downloadzsh-dc9af89669135a61d306c34caf0a55ab9be1f6ea.tar.gz
zsh-dc9af89669135a61d306c34caf0a55ab9be1f6ea.tar.bz2
zsh-dc9af89669135a61d306c34caf0a55ab9be1f6ea.zip
Merge pull request #3372 from bbiao/compatible-with-new-autojump
autojump installed from github has mv the autojump.zsh to $HOME/.autojum...
-rw-r--r--plugins/autojump/autojump.plugin.zsh2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 652d22696..4cf036401 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,6 +1,8 @@
if [ $commands[autojump] ]; then # check if autojump is installed
if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
. $HOME/.autojump/etc/profile.d/autojump.zsh
+ elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation
+ . $HOME/.autojump/share/autojump/autojump.zsh
elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.zsh ]; then # nix installation
. $HOME/.nix-profile/etc/profile.d/autojump.zsh
elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package