github-cicd: shellcheck: fix a few more SC1087, SC2145, SC2148

Author: spacelama

files/homes.custom/.bashrc.d/override-turnkey-prompt.sh

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 if [ -e /etc/turnkey_version ] ; then
     PROMPT_COMMAND=handleprompt
 fi

files/tree/etc/bash.bashrc.d/finalise_prompt.sh

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # unconditionally set PROMPT_COMMAND as an inexpensive way of
 # intercepting the first time a prompt is returned once a shell is
 # opened.  Sourcing this file more than once won't result in that

files/tree/etc/bash.bashrc.d/helpers.sh

@@ -68,15 +68,15 @@ log_to_file() {
 # debugging trace functions
 calling() {
     if [ -n "$BASH_DEBUG" ] ; then
-        echo "Calling: $@"
+        echo "Calling:" "$@"
 #        bt
         print_callers
     fi 1>&2
 }
 
 called() {
     if [ -n "$BASH_DEBUG" ] ; then
-        echo "Returning from: $@"
+        echo "Returning from:" "$@"
 #        bt
         print_callers
     fi 1>&2

files/tree/etc/bash.bashrc.d/prompt.sh

@@ -211,8 +211,8 @@ else
         if [ "$REALHOST" != "$LONGHOST" ] ; then
             me="${USER}"@"${REALHOST}"
         fi
-        local bold="\\[$ESC[7m\\]"
-        local norm="\\[$ESC[m\\]"
+        local bold="\\[${ESC}[7m\\]"
+        local norm="\\[${ESC}[m\\]"
         local shell=
         [ -z "$SSH_CONNECTION" ] && background black
         #            local git="$(is_on_git && [[ -n $(timeout 1 git branch 2> /dev/null) ]] && echo :)${bold}$(parse_git_branch)${norm}"
@@ -233,7 +233,7 @@ else
 
         #            echo 'setprompt ran?'
         PS1_PREV_EXIT_CODE="\`echo -n '\[$ESC' ; if [ \$retcode = 0 ]; then echo -n '[0;32m'; else echo -n '[0;31m'; fi ; echo -n '\]' ; echo -n \$retcode\`"
-        PS1_PRE="#$PS1_PREV_EXIT_CODE\[$ESC[0m\]"'-\j-\t, \d '$(colorizeprompt)":\\w"
+        PS1_PRE="#$PS1_PREV_EXIT_CODE\[${ESC}[0m\]"'-\j-\t, \d '$(colorizeprompt)":\\w"
         #$git
         PS1_POST=" ($shell"')\n'"${bold}"': \!,\#;'"${norm} "
         GIT_PROMPT_START_USER="$PS1_PRE"

files/tree/etc/bash.bashrc.d/setup-aliases.sh

@@ -75,9 +75,11 @@ function setup_aliases() {
     function validate_erb { erb -P -x -T '-' $1 | ruby -c ; }
 
     function l-() {
+        # shellcheck disable=SC2145   # incorrect interpretation of what the code is successfully doing: prepending "-" to to only the first of set of args provided
         command ls -lA $enablecolor -"$@"
     }
     function ls-() {
+        # shellcheck disable=SC2145   # incorrect interpretation of what the code is successfully doing: prepending "-" to to only the first of set of args provided
         command ls $enablecolor -"$@"
     }