Merge branch 'fix/autojump-plugin'

Fixes #7568
Closes #4542
Closes #5163
Closes #6868

plugins/autojump/autojump.plugin.zsh

@@ -1,23 +1,39 @@
-if [ $commands[autojump] ]; then # check if autojump is installed
+(( $+commands[autojump] )) || {
-  if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
+  echo '[oh-my-zsh] Please install autojump first (https://github.com/wting/autojump)'
-    . $HOME/.autojump/etc/profile.d/autojump.zsh
+  return
-  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
+declare -a autojump_paths
-    . $HOME/.nix-profile/etc/profile.d/autojump.zsh
+autojump_paths=(
-  elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation
+  $HOME/.autojump/etc/profile.d/autojump.zsh         # manual installation
-    . /run/current-system/sw/share/autojump/autojump.zsh
+  $HOME/.autojump/share/autojump/autojump.zsh        # manual installation
-  elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+  $HOME/.nix-profile/etc/profile.d/autojump.sh       # NixOS installation
-    . /usr/share/autojump/autojump.zsh
+  /run/current-system/sw/share/autojump/autojump.zsh # NixOS installation
-  elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
+  /usr/share/autojump/autojump.zsh                   # Debian and Ubuntu package
-    . /etc/profile.d/autojump.zsh
+  /etc/profile.d/autojump.zsh                        # manual installation
-  elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
+  /etc/profile.d/autojump.sh                         # Gentoo installation
-    . /etc/profile.d/autojump.sh
+  /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
-  elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
+  /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
-    . /usr/local/share/autojump/autojump.zsh
+  /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
-  elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
+)
-    . /opt/local/etc/profile.d/autojump.sh
+
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
+for file in $autojump_paths; do
-    . `brew --prefix`/etc/autojump.sh
+  if [[ -f "$file" ]]; then
+    source "$file"
+    found=1
+    break
+  fi
+done
+
+# if no path found, try Homebrew
+if (( ! found && $+commands[brew] )); then
+  file=$(brew --prefix)/etc/profile.d/autojump.sh
+  if [[ -f "$file" ]]; then
+    source "$file"
+    found=1
   fi
 fi
+
+(( ! found )) && echo '[oh-my-zsh] autojump script not found'
+
+unset autojump_paths file found