From 0d80e9b4ee4925da24f5c2ef9082f6660d983113 Mon Sep 17 00:00:00 2001 From: Elton Chen-Yu Ho Date: Tue, 19 Jun 2018 04:12:07 +0800 Subject: [PATCH 1/4] Fix zshrc alias when $EDITOR uses parameters (#6146) According to #5003 if one exports EDITOR with parameters, say: `export EDITOR='subl -w'` running command: `zshrc` will result in: `zsh: command not found: subl -w` This can be fixed by updating common-aliases.plugin.zsh line 16 with: `alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file` Fixes #5003 --- plugins/common-aliases/common-aliases.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh index 742798f27..6a7daf845 100644 --- a/plugins/common-aliases/common-aliases.plugin.zsh +++ b/plugins/common-aliases/common-aliases.plugin.zsh @@ -13,7 +13,7 @@ alias lS='ls -1FSsh' alias lart='ls -1Fcart' alias lrt='ls -1Fcrt' -alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file +alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file alias grep='grep --color' alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} ' From 6af58f492f8c5219e27f74cf6378e92834d1b3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Mon, 18 Jun 2018 22:47:51 +0200 Subject: [PATCH 2/4] common-aliases: delete unexistant command `display_info` doesn't exist in any known platform Fixes #5208 --- plugins/common-aliases/common-aliases.plugin.zsh | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh index 6a7daf845..785a09c63 100644 --- a/plugins/common-aliases/common-aliases.plugin.zsh +++ b/plugins/common-aliases/common-aliases.plugin.zsh @@ -44,8 +44,6 @@ alias p='ps -f' alias sortnr='sort -n -r' alias unexport='unset' -alias whereami=display_info - alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' From a0b8eab5f0cd339082c1fe33d7bcfc34e38918b5 Mon Sep 17 00:00:00 2001 From: doofin <8177dph@gmail.com> Date: Tue, 19 Jun 2018 23:38:10 +0800 Subject: [PATCH 3/4] Update sbt.plugin.zsh (#6930) --- plugins/sbt/sbt.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh index 15acfec4f..8fabf0add 100644 --- a/plugins/sbt/sbt.plugin.zsh +++ b/plugins/sbt/sbt.plugin.zsh @@ -7,6 +7,7 @@ # aliases - mnemonic: prefix is 'sb' alias sbc='sbt compile' +alias sbcc='sbt clean compile' alias sbco='sbt console' alias sbcq='sbt console-quick' alias sbcl='sbt clean' From 6c1dab232033b79534d4583a4d6f40340bdf334c Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Wed, 20 Jun 2018 23:27:38 +0200 Subject: [PATCH 4/4] 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(-) 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