lint: fix shellcheck SC2068/SC2071

VerdantE1 · superjamie · commit 22be70d9da29 · 2026-02-18T13:48:14.000+11:00
diff --git a/xsos b/xsos
@@ -290,7 +290,9 @@ Special options (BASH v4+ required):"
  --N=FILE❚read from FILE containing /proc/net/dev dump
  --G=FILE❚read from FILE containing /proc/net/bonding/xxx dump
  --I=FILE❚read from FILE containing \`ip addr\` dump
- --P=FILE❚read from FILE containing \`ps aux\` dump" | column -ts❚
+ --P=FILE❚read from FILE containing \`ps aux\` dump
+ --S=FILE❚read from FILE containing \`ss -peaonmi\` dump
+ --F=FILE❚read from FILE containing \`systemctl_status_--all\` dump" | column -ts❚
 }
 
 HELP_SHORT() {
@@ -478,12 +480,13 @@ PARSE() {
       --G)  sfile[G]=$2; shift ;;
       --I)  sfile[I]=$2; shift ;;
       --P)  sfile[P]=$2; shift ;;
+      --S)  sfile[S]=$2; shift ;;
     esac
     shift
   done
   shift #(to get rid of the '--')
   # Set sosroot
-  sosroot=$@
+  sosroot="$@"
 }
 
 # Call the parser
@@ -2171,7 +2174,7 @@ TEAMING() {
   # If an sosreport, look for sos_commands/teamd/ output...
   else
     files=("$1"/sos_commands/teamd/teamdctl_*_state_dump)
-    if [[ ! -r ${files[0]} ]]; then
+    if [[ ! -r "${files[0]}" ]]; then
       echo -e "${c[Warn2]}Warning:${c[Warn1]} '/sos_commands/teamd/teamdctl_*_state_dump' files unreadable; skipping teaming check${c[0]}" >&2
       echo -en $XSOS_HEADING_SEPARATOR >&2
       return
@@ -2193,7 +2196,7 @@ TEAMING() {
     echo "  Device❚Runner (mode) ❚ifcfg-File TEAM_CONFIG❚Partner MAC Addr❚Ports (*=active; [n]=AggID)"
     echo "  ========❚=================❚========================❚==================❚==============================="
     
-    f=0; for team_input in ${files[@]}; do
+    f=0; for team_input in "${files[@]}"; do
       
       team_name=$(gawk -F '"' '/team_device/,/^$/ {if ($2 == "ifname") {print $4}}' $team_input)
       echo -n "  $team_name❚"
@@ -2293,7 +2296,7 @@ BONDING() {
   # If localhost or sosreport, use that
   else
     files=("$1"/proc/net/bonding/*)
-    if [[ ! -r ${files[0]} ]]; then
+    if [[ ! -r "${files[0]}" ]]; then
       echo -e "${c[Warn2]}Warning:${c[Warn1]} '/proc/net/bonding/' files unreadable; skipping bonding check${c[0]}" >&2
       echo -en $XSOS_HEADING_SEPARATOR >&2
       return
@@ -2343,7 +2346,7 @@ BONDING() {
     echo "  Device❚Mode❚ifcfg-File BONDING_OPTS❚Partner MAC Addr❚Slaves (*=active; [n]=AggID)"
     echo "  ========❚=================❚========================❚==================❚==============================="
     
-    f=0; for bond_input in ${files[@]}; do
+    f=0; for bond_input in "${files[@]}"; do
       
       echo -n "  ${bond_input##*/}❚"
       
@@ -3379,7 +3382,7 @@ PSCHECK() {
   fi
   
   # Calculate top cpu-using & mem-using users
-  if [[ $XSOS_PS_LEVEL < 3 ]]; then  # If verbosity level 0-2, restrict number of users shown
+  if [[ $XSOS_PS_LEVEL -lt 3 ]]; then  # If verbosity level 0-2, restrict number of users shown
     # Process ps input to generate summary user-list of top-users
     top_users=$(
       gawk -vu=$(tr '[:lower:]' '[:upper:]' <<<"$XSOS_PS_UNIT") '
@@ -3879,7 +3882,7 @@ NETSTAT(){
   }
   _print_proc_net_array(){
     declare -A __array="$*"
-    for hdr in ${!__array[@]}; do
+    for hdr in "${!__array[@]}"; do
       val="${__array[$hdr]}"
       [ "${XSOS_NETSTAT_IGNORE_ZERO}" == "y" ]   && [ "$val" -eq "0" ] && continue
       [ "${XSOS_NETSTAT_FILTER_REGEX}" != "" ]    && [[ ! ${hdr,,} =~ ${XSOS_NETSTAT_FILTER_REGEX,,} ]]    && continue
@@ -3976,6 +3979,8 @@ trap "rm -rf $TMPDIR 2>/dev/null" EXIT
     [[ -r ${sfile[G]} ]] && BONDING   "${sfile[G]}"
     [[ -r ${sfile[I]} ]] && IPADDR    "${sfile[I]}"
     [[ -r ${sfile[P]} ]] && PSCHECK   "${sfile[P]}"
+    [[ -r ${sfile[S]} ]] && SSCHECK   "${sfile[S]}"
+    [[ -r ${sfile[F]} ]] && FIREWALL  "${sfile[F]}"
 
   # If SOSREPORT-ROOT provided, use that
   elif [[ -n $sosroot ]]; then
diff --git a/xsos-bash-completion.bash b/xsos-bash-completion.bash
@@ -36,11 +36,11 @@ _xsos()  {
             -6 -q -u -v -w
             -x -y -z"
             
-    longopts="--help --version
-                        --all --bios --os --kdump --cpu --intrupt --mem --disks --mpath --lspci --ethtool --softirq --netdev --bonding --ip --net --sysctl --ps --ss --firewall --ifcfg --netstat
-                        --B --C --F --M --D --T --L --R --N --G --I --P
-                        --scrub --ipv6 --rhsupport --wwid --unit --threads --verbose --width
-                        --nocolor --less --more"
+  longopts="--help --version
+            --all --bios --os --kdump --cpu --intrupt --mem --disks --mpath --lspci --ethtool --softirq --netdev --bonding --ip --net --sysctl --ps -ss --firewall --ifcfg --netstat
+            --B --C --F --M --D --T --L --R --N --G --I --P
+            --scrub --ipv6 --wwid --unit --threads --verbose --width
+            --nocolor --less --more"
   
   # Check previous arg to see if we need to do anything special
   case "$prev" in
