From af089473bd2ce2decc9f669f7fcd8ebf9539b108 Mon Sep 17 00:00:00 2001 From: hophacker Date: Wed, 19 Feb 2020 12:58:35 +0800 Subject: [PATCH] convert h to original helm --- SpaceVim.d/autoload/paiyou.vim | 1 - zsh/functions.zsh | 30 ++++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/SpaceVim.d/autoload/paiyou.vim b/SpaceVim.d/autoload/paiyou.vim index 95b51c5..a6cfbd1 100644 --- a/SpaceVim.d/autoload/paiyou.vim +++ b/SpaceVim.d/autoload/paiyou.vim @@ -324,4 +324,3 @@ endfunction " set paste nnoremap tp :call TogglePaste() nnoremap tt :call ToggleRspecTest() - diff --git a/zsh/functions.zsh b/zsh/functions.zsh index 327d55b..206046c 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -240,8 +240,7 @@ function kubectl() { case $1 in -c) CONTEXT="$2" - shift - shift + shift; shift ;; --context=*) CONTEXT="${i#*=}" @@ -263,8 +262,7 @@ function stern { case $1 in -c) CONTEXT="$2" - shift - shift + shift; shift ;; --context=*) CONTEXT="${i#*=}" @@ -279,15 +277,23 @@ function stern { echo "stern $finalopts --kubeconfig=$HOME/.kube/${CONTEXT}_config" command stern $finalopts -t --since 10m --kubeconfig=$HOME/.kube/${CONTEXT}_config } -alias kg="k -c qcloud" -function h() { +function helm() { CONTEXT=gcloud - while getopts ":c:" opt; do - case ${opt} in - c) - CONTEXT=$OPTARG + finalopts=() + while [[ $@ != "" ]] do + case $1 in + -c) + CONTEXT="$2" shift; shift ;; + --context=*) + CONTEXT="${i#*=}" + shift + ;; + *) + finalopts+=($1) + shift + ;; esac done TLS="" @@ -295,9 +301,9 @@ function h() { gcloud) TLS="--tls" esac - helm $* $TLS --kubeconfig $HOME/.kube/${CONTEXT}_config + echo "helm $finalopts $TLS --kubeconfig=$HOME/.kube/${CONTEXT}_config" + command helm $finalopts $TLS --kubeconfig=$HOME/.kube/${CONTEXT}_config } -alias hg="h -c qcloud" function kexec { RAN=false CONTEXT=gcloud