github-cicd: shellcheck: fix a few SC2290, SC2145, SC2148

Author: spacelama

files/homes.desktop/bin/paswitch

@@ -66,6 +66,7 @@ echocolour() {
         esac
         shift
     done
+    # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
     log "$@${normal}"
 }
 
@@ -201,7 +202,7 @@ function set_all_current_active_sinks() {
         # echo application_name=$application_name
 
         inputs="$inputs $index"
-    done < <( pactl list sink-inputs | grep -e '^Sink Input' -e 'application.name = ' ) # -e State: -e Flags: 
+    done < <( pactl list sink-inputs | grep -e '^Sink Input' -e 'application.name = ' ) # -e State: -e Flags:
     # FIXME: sink, card, state can be obtained from `pactl list sources short`, flags from `pactl list sinks | grep -i flag`
     # FLAG, STATE from `pactl list sinks | grep -i -e flag -e state`
     # sink-inputs gets name but not state, flags; sinks gets flag, state but not name;

files/homes.desktop/bin/runxscreensaver-monitor

@@ -38,7 +38,7 @@ restart_xscreensaver() {
 
     notify " - Will restart xscreensaver"
     systemctl --user restart runxscreensaver.service
-    echo " *** $@"
+    echo " ***" "$@"
 }
 
 export PATH=$PATH:$HOME/bin

files/homes/.bashrc

@@ -1,4 +1,5 @@
 # -*- Mode: shell-script -*-
+# shellcheck shell=bash
 
 # User specific environment and startup programs
 

files/tree/etc/bash.bashrc.d/0-detect-system.sh

@@ -1,5 +1,5 @@
 # -*- Mode: shell-script -*-
-
+# shellcheck shell=bash
 
 #set -x 
 

files/tree/etc/bash.bashrc.d/0-first-bashrc.sh

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function sh_interactive () {
     case "$-" in
        *i*)

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # https://stackoverflow.com/questions/68768860/how-to-print-all-function-calling-orders-in-a-bash-script
 
 # http://wiki.bash-hackers.org/commands/builtin/caller

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function exitcleanly() {
     #    exiting=true
     # cancel all traps we set up ourselves to manage prompt and history:

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # We've long appended our bash history upon a command running, using
 # various methods.  `trap '...' DEBUG` was causing us to have to write
 # lots of code just to make sure the command being tested was a user
@@ -196,7 +199,7 @@ else
         fi
 
         local me="${USER}"@"${SHORTHOST}"
-        if [ $REALHOST != $LONGHOST ] ; then
+        if [ "$REALHOST" != "$LONGHOST" ] ; then
             me="${USER}"@"${REALHOST}"
         fi
         winname  "$EXTRA_TITLE`date +%d/%m-%H:%M:%S` -- $PTS -- $cmd -- ${me}: `chomp --escapechars --right ... $((COLUMNS-60)) ${shortpwd}`" ;
@@ -205,7 +208,7 @@ else
     function setprompt () {
         local shortpwd="${PWD/$HOME/~}"
         local me="${USER}"@"${SHORTHOST}"
-        if [ $REALHOST != $LONGHOST ] ; then
+        if [ "$REALHOST" != "$LONGHOST" ] ; then
             me="${USER}"@"${REALHOST}"
         fi
         local bold="\\[$ESC[7m\\]"

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # constructs PATH paying attention to not add anything that is not
 # currently quickly accesible over NFS for example
 

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # some aliases are always loaded regardless of what kind of login session
 alias l='ls -lA'
 
@@ -33,7 +36,9 @@ function setup_aliases() {
     alias p='pstree -ap tconnors'
     alias pavucontrol='DBUS_SESSION_BUS_ADDRESS= pavucontrol'  # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/75#note_1467143
     alias bc='bc -l'
+    # shellcheck disable=SC2290   # incorrect interpretation of what the code is successfully doing: setting aliases to the "-" and "+" commands
     alias -- +='pushd .'
+    # shellcheck disable=SC2290   # incorrect interpretation of what the code is successfully doing: setting aliases to the "-" and "+" commands
     alias -- -='popd'
     alias bd='popd'
     alias ..='cd ..'

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 setup_bash_settings() {
 #    echo setup_bash_settings 1>&2
     setup_bash_history_settings

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function setup_display() {
     if [ -n "$DISPLAY" ] ; then
         # stop trying to store masses of keys in NFS $HOME - just start

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 # add all the other bash settings we care about, paths, etc, that
 # would normally have gone in .bash_profile
 function setup_environment() {

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function setup_remote_aliases() {
     alias marvin-jump='background rgb:04/11/33 ; ssh marvin-jump ; background black'
     alias hactar-jump=marvin-jump

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function sillysu() {
     if [ -n "$DISPLAY" ] ; then
         command cp -a $XAUTHORITY /tmp/.$USER.Xauthority.tmp  # this temporary file is pulled in by root's login scripts

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

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 function ontsocks() {
   #FIXME: if 64 bit apps start being needed, may eventually compile for 64 bit, and then move it into ~/.../sparcv9/ (or /64/), and then remove this hack.  Maybe just need to have both versions, and set $LD_PRELOAD, and it will pick it the correct version in the correct path
   #FIXME: in fact, the whole hack can probably be removed, since solaris can probably deal with the different 32/64 bit paths in $LD_LIBRARY_PATH implicitly too, and just setting LD_PRELOAD to libtsocks without an explicit path

files/tree/etc/bash.bashrc.d/z-last-bashrc.sh

@@ -1,3 +1,6 @@
+# -*- Mode: shell-script -*-
+# shellcheck shell=bash
+
 if [ -n "$NONINTERACT" ] ; then
     setup_environment
 fi

files/tree/usr/local/bin/colorize

@@ -86,7 +86,7 @@ usage() {
 
 usageerror() {
     if [ "$#" != 0 ] ; then
-        echo "Usage error: $@" 1>&2
+        echo "Usage error:" "$@" 1>&2
         echo "Usage was $ARGS" 1>&2
     fi
     usage 1

files/tree/usr/local/bin/colorizecommand

@@ -71,7 +71,7 @@ usage() {
 
 usageerror() {
     if [ "$#" != 0 ] ; then
-        echo "Usage error: $@" 1>&2
+        echo "Usage error:" "$@" 1>&2
         echo "Usage was $ARGS" 1>&2
     fi
     usage 1

files/tree/usr/local/bin/statusbeep

@@ -10,7 +10,7 @@
 
 if [ $# -ne 3 ] ; then
    echo "Usage: $0 <status> <newtime> <oldtime>" 1>&2
-   echo "Usage was $@" 1>&2
+   echo "Usage was" "$@" 1>&2
    exit 1
 fi
 

roles/nutserver/files/upssched-cmd

@@ -12,38 +12,46 @@
 
 case $1 in
     upsgone)
-        echo "The UPS has been gone for awhile: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning gone, $UPSNAME" tconnors
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
+        echo "The UPS has been gone for a while: ""$@"", $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning gone, $UPSNAME" tconnors
         ;;
     onbattwarn)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "The UPS is currently running on battery power! $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning on batt, $UPSNAME" tconnors
         #echo "We will shut down" | mail -s "upscched-cmd: UPS temporary workaround to shutdown machine on mains power" tconnors
         # need to run as root, but we're trying to shut down the UPS as well - the web says nut does this automatically
         #/usr/sbin/upsmon -c fsd
         ;;
     online)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "The UPS is OK now! $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS OK, $UPSNAME" tconnors
         ;;
     fsd)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "FSD: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning FSD, $UPSNAME" tconnors
         #       echo "We will shut down" | mail -s "upscched-cmd: UPS temporary workaround to shutdown machine on mains power" tconnors
         #       /sbin/shutdown -h +0
         ;;
     lowbatt)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "Low battery: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning low batt, $UPSNAME" tconnors
         #        echo "We will shut down" | mail -s "upscched-cmd: UPS temporary workaround to shutdown machine on mains power" tconnors
         #        /sbin/shutdown -h +0
         #        /usr/sbin/upsmon -c fsd
         ;;
     shutdown)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "Shutdown: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning shutting down, $UPSNAME" tconnors
         #        echo "We will shut down" | mail -s "upscched-cmd: UPS temporary workaround to shutdown machine on mains power" tconnors
         #        /sbin/shutdown -h +0
         #        /usr/sbin/upsmon -c fsd
         ;;
     replacebatt)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "Replace battery: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning replace battery, $UPSNAME" tconnors
         ;;
     *)
+        # shellcheck disable=SC2145   # I know how fixed_"$@" behaves and it's correct!
         echo "Unrecognized command: $@, $NOTIFYTYPE, $UPSNAME" | mail -s "UPS warning, $UPSNAME" tconnors
         ;;
 esac

roles/openwrt/files/.bash_profile

@@ -1,3 +1,4 @@
+# -*- Mode: shell-script -*-
 # shellcheck shell=bash
 
 PATH=$PATH:/root/bin