From 1e027509d840d0d2a2fee1001543a5f2f34b3c28 Mon Sep 17 00:00:00 2001 From: Wenzheng Jiang Date: Thu, 2 Nov 2017 00:05:35 +1100 Subject: Add nixos support for autojump plugin (#6365) --- plugins/autojump/autojump.plugin.zsh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index c05c699e1..7339fad9e 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -5,6 +5,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed . $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 /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation + . /run/current-system/sw/share/autojump/autojump.zsh elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package . /usr/share/autojump/autojump.zsh elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation -- cgit v1.2.3-70-g09d2 From 6c1dab232033b79534d4583a4d6f40340bdf334c Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Wed, 20 Jun 2018 23:27:38 +0200 Subject: Fix autojump sourcing on OSX with Macports (#4801) * Fix autojump sourcing on OSX with Macports The last version of autojump available on Macports does not have anymore different shell scripts (.sh, .zsh, .bash ...) to be sourced but just one autojump.sh that takes care of that located at /opt/local/etc/profile.d/autojump.sh fix # 4625 * Fix bug with macports autojump on OSX. --- plugins/autojump/autojump.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 7339fad9e..c0af67631 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -15,8 +15,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed . /etc/profile.d/autojump.sh elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation . /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 [ -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 . `brew --prefix`/etc/autojump.sh fi -- cgit v1.2.3-70-g09d2 From 3c9942c4884089b290ef750468b29419ca0de271 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 9 Oct 2018 20:34:47 +0200 Subject: autojump: move README to right place --- plugins/autoenv/README.md | 11 ----------- plugins/autojump/README.md | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 plugins/autoenv/README.md create mode 100644 plugins/autojump/README.md (limited to 'plugins/autojump') diff --git a/plugins/autoenv/README.md b/plugins/autoenv/README.md deleted file mode 100644 index 18ff793cd..000000000 --- a/plugins/autoenv/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Autojump plugin - -This plugin loads the [autojump navigation tool](https://github.com/wting/autojump). - -To use it, add `autojump` to the plugins array in your zshrc file: - -```zsh -plugins=(... autojump) -``` - -More info on the usage: https://github.com/wting/autojump diff --git a/plugins/autojump/README.md b/plugins/autojump/README.md new file mode 100644 index 000000000..18ff793cd --- /dev/null +++ b/plugins/autojump/README.md @@ -0,0 +1,11 @@ +# Autojump plugin + +This plugin loads the [autojump navigation tool](https://github.com/wting/autojump). + +To use it, add `autojump` to the plugins array in your zshrc file: + +```zsh +plugins=(... autojump) +``` + +More info on the usage: https://github.com/wting/autojump -- cgit v1.2.3-70-g09d2 From 481a649f90008e8c45e650fb7127c9c7df0028e8 Mon Sep 17 00:00:00 2001 From: Maximilian Güntner Date: Wed, 15 Jun 2016 12:27:25 +0200 Subject: NixOS: Use autojump.sh to figure out location of autojump.zsh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- plugins/autojump/autojump.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index c0af67631..3946106b0 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -3,8 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed . $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 $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation + . $HOME/.nix-profile/etc/profile.d/autojump.sh elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation . /run/current-system/sw/share/autojump/autojump.zsh elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package -- cgit v1.2.3-70-g09d2 From 5e9ee67f2b7e53c9e4bb5a0220276a97a22ca0e6 Mon Sep 17 00:00:00 2001 From: Alex Parker Date: Fri, 23 Oct 2015 13:00:12 -0600 Subject: Update autojump.plugin.zsh I was adding autojump on a new machine and annoyingly forgot that autojump was to be installed on its own. This may be helpful. --- plugins/autojump/autojump.plugin.zsh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 3946106b0..c7da73b23 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -20,4 +20,6 @@ if [ $commands[autojump] ]; then # check if autojump is installed elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew . `brew --prefix`/etc/autojump.sh fi +else + echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)' fi -- cgit v1.2.3-70-g09d2 From ab63d240dadc964eee4fcdf14c0c46689f879ac8 Mon Sep 17 00:00:00 2001 From: rl1k <38787215+rl1k@users.noreply.github.com> Date: Mon, 28 May 2018 21:57:49 +0200 Subject: Use source instead of dot to load autojump --- plugins/autojump/autojump.plugin.zsh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index c7da73b23..17f01a9cf 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -1,24 +1,24 @@ 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 + source $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 + source $HOME/.autojump/share/autojump/autojump.zsh elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation - . $HOME/.nix-profile/etc/profile.d/autojump.sh + source $HOME/.nix-profile/etc/profile.d/autojump.sh elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation - . /run/current-system/sw/share/autojump/autojump.zsh + source /run/current-system/sw/share/autojump/autojump.zsh elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package - . /usr/share/autojump/autojump.zsh + source /usr/share/autojump/autojump.zsh elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation - . /etc/profile.d/autojump.zsh + source /etc/profile.d/autojump.zsh elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation - . /etc/profile.d/autojump.sh + source /etc/profile.d/autojump.sh elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation - . /usr/local/share/autojump/autojump.zsh + source /usr/local/share/autojump/autojump.zsh elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports - . /opt/local/etc/profile.d/autojump.sh + source /opt/local/etc/profile.d/autojump.sh elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew - . `brew --prefix`/etc/autojump.sh + source `brew --prefix`/etc/autojump.sh fi else echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)' -- cgit v1.2.3-70-g09d2 From 4ef29c9f1883acecb638a64ddb1eff8618312cdc Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 9 Apr 2019 19:21:05 +0200 Subject: Fix homebrew path location --- plugins/autojump/autojump.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 17f01a9cf..3434fb37b 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -17,8 +17,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed source /usr/local/share/autojump/autojump.zsh elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports source /opt/local/etc/profile.d/autojump.sh - elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew - source `brew --prefix`/etc/autojump.sh + elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew + source $(brew --prefix)/etc/profile.d/autojump.sh fi else echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)' -- cgit v1.2.3-70-g09d2 From 5a424fc12fc62512400887236ef20ea2268bba94 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 9 Apr 2019 19:22:51 +0200 Subject: Check first default Homebrew prefix --- plugins/autojump/autojump.plugin.zsh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 3434fb37b..81664e1ae 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -17,6 +17,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed source /usr/local/share/autojump/autojump.zsh elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports source /opt/local/etc/profile.d/autojump.sh + elif [ -f /usr/local/etc/profile.d/autojump.sh ]; then # mac os x with brew + source /usr/local/etc/profile.d/autojump.sh elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew source $(brew --prefix)/etc/profile.d/autojump.sh fi -- cgit v1.2.3-70-g09d2 From fd105b6e528127c2c6f5cf59d0e32d761c206971 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 9 Apr 2019 19:38:34 +0200 Subject: Refactor and clean up autojump plugin --- plugins/autojump/autojump.plugin.zsh | 57 ++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 25 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 81664e1ae..7ccd09303 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -1,27 +1,34 @@ -if [ $commands[autojump] ]; then # check if autojump is installed - if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation - source $HOME/.autojump/etc/profile.d/autojump.zsh - elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation - source $HOME/.autojump/share/autojump/autojump.zsh - elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation - source $HOME/.nix-profile/etc/profile.d/autojump.sh - elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation - source /run/current-system/sw/share/autojump/autojump.zsh - elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package - source /usr/share/autojump/autojump.zsh - elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation - source /etc/profile.d/autojump.zsh - elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation - source /etc/profile.d/autojump.sh - elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation - source /usr/local/share/autojump/autojump.zsh - elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports - source /opt/local/etc/profile.d/autojump.sh - elif [ -f /usr/local/etc/profile.d/autojump.sh ]; then # mac os x with brew - source /usr/local/etc/profile.d/autojump.sh - elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew - source $(brew --prefix)/etc/profile.d/autojump.sh +(( $+commands[autojump] )) || { + echo '[oh-my-zsh] Please install autojump first (https://github.com/wting/autojump)' + return +} + +declare -a autojump_paths +autojump_paths=( + $HOME/.autojump/etc/profile.d/autojump.zsh # manual installation + $HOME/.autojump/share/autojump/autojump.zsh # manual installation + $HOME/.nix-profile/etc/profile.d/autojump.sh # NixOS installation + /run/current-system/sw/share/autojump/autojump.zsh # NixOS installation + /usr/share/autojump/autojump.zsh # Debian and Ubuntu package + /etc/profile.d/autojump.zsh # manual installation + /etc/profile.d/autojump.sh # Gentoo installation + /usr/local/share/autojump/autojump.zsh # FreeBSD installation + /opt/local/etc/profile.d/autojump.sh # macOS with MacPorts + /usr/local/etc/profile.d/autojump.sh # macOS with Homebrew (default) +) + +for file in $autojump_paths; do + if [[ -f "$file" ]]; then + source "$file" + found=1 + break fi -else - echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)' +done + +# if no path found, try Homebrew +if (( ! found && $+commands[brew] )); then + file=$(brew --prefix)/etc/profile.d/autojump.sh + [[ -f "$file" ]] && source "$file" fi + +unset autojump_paths file found -- cgit v1.2.3-70-g09d2 From b4c06f2b50e499fbd6b827c1b287276d9cacd3e6 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 9 Apr 2019 19:41:59 +0200 Subject: Complain when no autojump script was found --- plugins/autojump/autojump.plugin.zsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 7ccd09303..13c1d00ed 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -28,7 +28,12 @@ done # if no path found, try Homebrew if (( ! found && $+commands[brew] )); then file=$(brew --prefix)/etc/profile.d/autojump.sh - [[ -f "$file" ]] && source "$file" + if [[ -f "$file" ]]; then + source "$file" + found=1 + fi fi +(( ! found )) && echo '[oh-my-zsh] autojump script not found' + unset autojump_paths file found -- cgit v1.2.3-70-g09d2 From 9524db7398f405b26091f58fa8e2125d4e440a24 Mon Sep 17 00:00:00 2001 From: mapshen Date: Tue, 27 Aug 2019 15:41:44 -0400 Subject: autojump: fix loading when autojump is not in $PATH (#8074) The `commands[autojump]` block errs out when autojump is not found, and the rest, which is intended to be used for loading `autojump`, does not get executed. --- plugins/autojump/autojump.plugin.zsh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'plugins/autojump') diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 13c1d00ed..d80c88822 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -1,8 +1,3 @@ -(( $+commands[autojump] )) || { - echo '[oh-my-zsh] Please install autojump first (https://github.com/wting/autojump)' - return -} - declare -a autojump_paths autojump_paths=( $HOME/.autojump/etc/profile.d/autojump.zsh # manual installation -- cgit v1.2.3-70-g09d2