From 9591ec0668697ae72927a781ab708b9471ee6ef6 Mon Sep 17 00:00:00 2001 From: Doraken Date: Wed, 16 Aug 2023 18:14:46 +0200 Subject: [PATCH 1/5] update on alias ( minor ) --- aliases/available/apt.aliases.bash | 15 +++++++++++++-- aliases/available/curl.aliases.bash | 15 +++++++++++++-- aliases/available/emacs.aliases.bash | 2 +- aliases/available/git.aliases.bash | 6 ++++-- aliases/available/kubectl.aliases.bash | 3 ++- aliases/available/textmate.aliases.bash | 2 +- aliases/available/uuidgen.aliases.bash | 6 ++++-- 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/aliases/available/apt.aliases.bash b/aliases/available/apt.aliases.bash index 1d43ffac..1c42f102 100644 --- a/aliases/available/apt.aliases.bash +++ b/aliases/available/apt.aliases.bash @@ -6,8 +6,15 @@ cite 'about-alias' about-alias 'Apt and dpkg aliases for Ubuntu and Debian distros.' # set apt aliases -function _set_pkg_aliases() { - if _command_exists apt; then +function _set_pkg_aliases() +{ + ############ STACK_TRACE_BUILDER ##################### + Function_Name="${FUNCNAME[0]}" + Function_PATH="${Function_PATH}/${Function_Name}" + ###################################################### + + if _command_exists apt + then alias apts='apt-cache search' alias aptshow='apt-cache show' alias aptinst='sudo apt-get install -V' @@ -22,6 +29,10 @@ function _set_pkg_aliases() { alias pkgfiles='dpkg --listfiles' fi + + ############### Stack_TRACE_BUILDER ################ + Function_PATH="$( dirname ${Function_PATH} )" + #################################################### } _set_pkg_aliases diff --git a/aliases/available/curl.aliases.bash b/aliases/available/curl.aliases.bash index a270e416..7be40dca 100644 --- a/aliases/available/curl.aliases.bash +++ b/aliases/available/curl.aliases.bash @@ -2,8 +2,15 @@ about-alias 'Curl aliases for convenience.' # set apt aliases -function _set_pkg_aliases() { - if _command_exists curl; then +function _set_pkg_aliases() +{ + ############ STACK_TRACE_BUILDER ##################### + Function_Name="${FUNCNAME[0]}" + Function_PATH="${Function_PATH}/${Function_Name}" + ###################################################### + + if _command_exists curl + then # follow redirects alias cl='curl -L' # follow redirects, download as original name @@ -17,6 +24,10 @@ function _set_pkg_aliases() { # see only response headers from a get request alias clhead='curl -D - -so /dev/null' fi + + ############### Stack_TRACE_BUILDER ################ + Function_PATH="$( dirname ${Function_PATH} )" + #################################################### } _set_pkg_aliases diff --git a/aliases/available/emacs.aliases.bash b/aliases/available/emacs.aliases.bash index a4e4111a..c0717a2b 100644 --- a/aliases/available/emacs.aliases.bash +++ b/aliases/available/emacs.aliases.bash @@ -1,7 +1,7 @@ # shellcheck shell=bash about-alias 'emacs editor' -case $OSTYPE in +case ${OSTYPE} in linux*) alias em='emacs' alias en='emacs -nw' diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 5572c932..58844bfd 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -199,11 +199,13 @@ case $OSTYPE in esac # functions -function gdv() { +function gdv() +{ git diff --ignore-all-space "$@" | vim -R - } -function get_default_branch() { +function get_default_branch() +{ if git branch | grep -q '^. main\s*$'; then echo main else diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash index ce01bdaf..e87a307c 100644 --- a/aliases/available/kubectl.aliases.bash +++ b/aliases/available/kubectl.aliases.bash @@ -1,7 +1,8 @@ # shellcheck shell=bash about-alias 'kubectl aliases' -if _command_exists kubectl; then +if _command_exists kubectl + then alias kc='kubectl' alias kcgp='kubectl get pods' alias kcgd='kubectl get deployments' diff --git a/aliases/available/textmate.aliases.bash b/aliases/available/textmate.aliases.bash index e53eed1a..539cd3d3 100644 --- a/aliases/available/textmate.aliases.bash +++ b/aliases/available/textmate.aliases.bash @@ -1,7 +1,7 @@ # shellcheck shell=bash about-alias 'textmate abbreviations' -case $OSTYPE in +case ${OSTYPE} in darwin*) # Textmate alias e='mate . &' diff --git a/aliases/available/uuidgen.aliases.bash b/aliases/available/uuidgen.aliases.bash index 45c36820..9ca38629 100644 --- a/aliases/available/uuidgen.aliases.bash +++ b/aliases/available/uuidgen.aliases.bash @@ -1,10 +1,12 @@ # shellcheck shell=bash about-alias 'uuidgen aliases' -if _command_exists uuid; then # Linux +if _command_exists uuid + then # Linux alias uuidu="uuid | tr '[:lower:]' '[:upper:]'" alias uuidl=uuid -elif _command_exists uuidgen; then # macOS/BSD +elif _command_exists uuidgen + then # macOS/BSD alias uuidu="uuidgen" alias uuid="uuidgen | tr '[:upper:]' '[:lower:]'" # because upper case is like YELLING alias uuidl=uuid From 2d1f8bbecc3301b34db9bdc3e12a25249518ab47 Mon Sep 17 00:00:00 2001 From: Doraken Date: Wed, 16 Aug 2023 18:25:10 +0200 Subject: [PATCH 2/5] update go line --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e772ec5..38c37638 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: # - name: Update APT Package Lists # run: sudo apt-get update - name: Install shfmt - run: GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt + run: go install mvdan.cc/sh/v3/cmd/shfmt@latest - name: Install shellcheck env: scversion: stable # Or latest, vxx, etc From e3584b1d4c64418454dacfcf7b014bca37360625 Mon Sep 17 00:00:00 2001 From: Doraken Date: Wed, 16 Aug 2023 18:26:18 +0200 Subject: [PATCH 3/5] update go vertion --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38c37638..97bd0e6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.19 - name: Set up Python uses: actions/setup-python@v2 with: From 1ea363896f6bad1ea229e04aa4ad74b40b315c1f Mon Sep 17 00:00:00 2001 From: Doraken Date: Wed, 16 Aug 2023 18:32:23 +0200 Subject: [PATCH 4/5] lint update for var protection structure --- aliases/available/apt.aliases.bash | 2 +- aliases/available/curl.aliases.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aliases/available/apt.aliases.bash b/aliases/available/apt.aliases.bash index 1c42f102..f96081ca 100644 --- a/aliases/available/apt.aliases.bash +++ b/aliases/available/apt.aliases.bash @@ -31,7 +31,7 @@ function _set_pkg_aliases() fi ############### Stack_TRACE_BUILDER ################ - Function_PATH="$( dirname ${Function_PATH} )" + Function_PATH=$( dirname ${Function_PATH} ) #################################################### } diff --git a/aliases/available/curl.aliases.bash b/aliases/available/curl.aliases.bash index 7be40dca..cc76c4bd 100644 --- a/aliases/available/curl.aliases.bash +++ b/aliases/available/curl.aliases.bash @@ -26,7 +26,7 @@ function _set_pkg_aliases() fi ############### Stack_TRACE_BUILDER ################ - Function_PATH="$( dirname ${Function_PATH} )" + Function_PATH=$( dirname ${Function_PATH} ) #################################################### } From afb6e2aabcfa97c3602260c5b66d2a9bb1c8ec19 Mon Sep 17 00:00:00 2001 From: Doraken Date: Wed, 16 Aug 2023 18:36:10 +0200 Subject: [PATCH 5/5] linter conrrection add duble quotes --- aliases/available/apt.aliases.bash | 2 +- aliases/available/curl.aliases.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aliases/available/apt.aliases.bash b/aliases/available/apt.aliases.bash index f96081ca..e33c7da8 100644 --- a/aliases/available/apt.aliases.bash +++ b/aliases/available/apt.aliases.bash @@ -31,7 +31,7 @@ function _set_pkg_aliases() fi ############### Stack_TRACE_BUILDER ################ - Function_PATH=$( dirname ${Function_PATH} ) + Function_PATH=$( dirname "${Function_PATH}" ) #################################################### } diff --git a/aliases/available/curl.aliases.bash b/aliases/available/curl.aliases.bash index cc76c4bd..00f2447d 100644 --- a/aliases/available/curl.aliases.bash +++ b/aliases/available/curl.aliases.bash @@ -26,7 +26,7 @@ function _set_pkg_aliases() fi ############### Stack_TRACE_BUILDER ################ - Function_PATH=$( dirname ${Function_PATH} ) + Function_PATH=$( dirname "${Function_PATH}" ) #################################################### }