From 2bd24f7e0de0ab2fa6131f15f49d3d86f4d7f4a8 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Tue, 14 Nov 2017 08:35:55 -0600 Subject: Fixed Pacaur aliases (#6416) `pacaur -Syua` only updated AUR pakcages, wihch is incompatible with semantics of `pacupg` and `yaupg`. Removing `-a` here it would work for both main repos and aur. --- plugins/archlinux/archlinux.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh index 105bd2d5f..0fab1252b 100644 --- a/plugins/archlinux/archlinux.plugin.zsh +++ b/plugins/archlinux/archlinux.plugin.zsh @@ -28,8 +28,8 @@ if (( $+commands[yaourt] )); then fi if (( $+commands[pacaur] )); then - alias paupg='pacaur -Syua' - alias pasu='pacaur -Syua --noconfirm' + alias paupg='pacaur -Syu' + alias pasu='pacaur -Syu --noconfirm' alias pain='pacaur -S' alias pains='pacaur -U' alias pare='pacaur -R' -- cgit v1.2.3-70-g09d2 From 510d90749f156ef5f10b656630191df13a86e989 Mon Sep 17 00:00:00 2001 From: Michael Nikitochkin Date: Tue, 14 Nov 2017 15:36:22 +0100 Subject: Fix the terraform function name (#6418) * Fix the terraform function name Current function name do worse. I always use `terr` and before those prompt it was add space in the end. Now because we have multiple functions and binaries started with terraform there are no space. * Updated terraform readme Updated the name of new function name --- plugins/terraform/README.md | 2 +- plugins/terraform/terraform.plugin.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md index b39f9916b..46855e417 100644 --- a/plugins/terraform/README.md +++ b/plugins/terraform/README.md @@ -17,5 +17,5 @@ your .zsh-theme file and in a choosen place insert: ``` $FG[045]\ -$(terraform_prompt_info)\ +$(tf_prompt_info)\ ``` diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh index 84eec5cc1..b170f73a6 100644 --- a/plugins/terraform/terraform.plugin.zsh +++ b/plugins/terraform/terraform.plugin.zsh @@ -1,4 +1,4 @@ -function terraform_prompt_info() { +function tf_prompt_info() { # check if in terraform dir if [ -d .terraform ]; then workspace=$(terraform workspace show 2> /dev/null) || return -- cgit v1.2.3-70-g09d2 From d792b1114c570ec1520ba7696c5c110d10cea41c Mon Sep 17 00:00:00 2001 From: catull Date: Tue, 14 Nov 2017 15:36:53 +0100 Subject: With zsh 5.4 a simple "local FLAGS" meant as an array must be explicitly declared so. This fix avoids the dreaded "parse_git_dirty:3: FLAGS: attempt to assign array value to non-array". (#6414) --- lib/git.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git.zsh b/lib/git.zsh index f7eccb81d..167b4b0ea 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -11,7 +11,7 @@ function git_prompt_info() { # Checks if working tree is dirty function parse_git_dirty() { local STATUS='' - local FLAGS + local -a FLAGS FLAGS=('--porcelain') if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then if [[ $POST_1_7_2_GIT -gt 0 ]]; then -- cgit v1.2.3-70-g09d2 From e273cf004e1ff0510aee61416885f3003bcd15d9 Mon Sep 17 00:00:00 2001 From: Brandon Weaver Date: Tue, 14 Nov 2017 06:37:31 -0800 Subject: Update ruby.plugin.zsh (#2117) Added some Gem command shorthands, and ruby shorthand --- plugins/ruby/ruby.plugin.zsh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh index 38e4d7cd0..177b35b31 100644 --- a/plugins/ruby/ruby.plugin.zsh +++ b/plugins/ruby/ruby.plugin.zsh @@ -4,3 +4,11 @@ alias sgem='sudo gem' # Find ruby file alias rfind='find . -name "*.rb" | xargs grep -n' + +# Shorthand Ruby +alias rb="ruby" + +# Gem Command Shorthands +alias gin="gem install" +alias gun="gem uninstall" +alias gli="gem list" -- cgit v1.2.3-70-g09d2