fix: switch from if $var to if [[ $var ]] for custom IFS

Co-authored-by: Ville Skyttä <[email protected]>

Author: akinomyoga

.shellcheckrc

@@ -5,6 +5,7 @@ disable=SC1090  # not really fixable usually (ever?)
 disable=SC2034  # for localizing variables set in called functions
 disable=SC2128  # intentional style choice
 disable=SC2206  # suggested alternatives fail in posix mode or use temp files
+disable=SC2209  # interferes with our `set` (literal) vs empty booleans
 disable=SC2207  # suggested alternatives fail in posix mode or use temp files
 
 # These disables are to be investigated and decided

bash_completion

@@ -859,16 +859,16 @@ _variables()
 #         -k: do not filter out already present tokens in value
 _comp_delimited()
 {
-    local prefix="" delimiter=$1 deduplicate=true
+    local prefix="" delimiter=$1 deduplicate=set
     shift
     if [[ $delimiter == -k ]]; then
-        deduplicate=false
+        deduplicate=""
         delimiter=$1
         shift
     fi
     [[ $cur == *$delimiter* ]] && prefix=${cur%"$delimiter"*}$delimiter
 
-    if $deduplicate; then
+    if [[ $deduplicate ]]; then
         # We could construct a -X pattern to feed to compgen, but that'd
         # conflict with possibly already set -X in $@, as well as have
         # glob char escaping issues to deal with. Do removals by hand instead.

completions/export

@@ -5,7 +5,7 @@ _comp_cmd_export()
     local cur prev words cword comp_args
     _comp_initialize -n := -- "$@" || return
 
-    local i action=variable remove=false
+    local i action=variable remove=""
     for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
             -p)
@@ -15,7 +15,7 @@ _comp_cmd_export()
                 action=function
                 ;;&
             -*n*)
-                remove=true
+                remove=set
                 ;;
             -*)
                 continue
@@ -52,7 +52,7 @@ _comp_cmd_export()
                 return
             fi
             local suffix=""
-            if ! $remove && [[ $action != function ]]; then
+            if [[ ! $remove && $action != function ]]; then
                 suffix="="
                 compopt -o nospace
             fi

completions/find

@@ -64,14 +64,14 @@ _comp_cmd_find()
             ;;
     esac
 
-    local i exprfound=false
+    local i exprfound=""
     # set exprfound to true if there is already an expression present
     for i in "${words[@]}"; do
-        [[ $i == [-\(\),\!]* ]] && exprfound=true && break
+        [[ $i == [-\(\),\!]* ]] && exprfound=set && break
     done
 
     # handle case where first parameter is not a dash option
-    if ! $exprfound && [[ $cur != [-\(\),\!]* ]]; then
+    if [[ ! $exprfound && $cur != [-\(\),\!]* ]]; then
         _filedir -d
         return
     fi

completions/fio

@@ -115,17 +115,17 @@ _comp_cmd_fio()
                     # For example, for --kb_base=:
                     #        valid values: 1024       [...]
                     #                    : 1000       [...]
-                    local line="" in_values=false
+                    local line="" in_values=""
                     ret=()
                     for line in "${cmdhelp[@]}"; do
-                        if $in_values; then
+                        if [[ $in_values ]]; then
                             if [[ $line =~ ^[[:space:]]*:[[:space:]]*([^[:space:]]+) ]]; then
                                 ret+=("${BASH_REMATCH[1]}")
                             else
                                 break
                             fi
                         elif [[ $line =~ ^[[:space:]]*valid\ values:[[:space:]]*([^[:space:]]+) ]]; then
-                            in_values=true
+                            in_values=set
                             ret+=("${BASH_REMATCH[1]}")
                         fi
                     done

completions/jarsigner

@@ -31,16 +31,16 @@ _jarsigner()
     esac
 
     # Check if a jar was already given.
-    local i jar=false
+    local i jar=""
     for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == *.@(jar|apk) &&
             ${words[i - 1]} != -signedjar ]]; then
-            jar=true
+            jar=set
             break
         fi
     done
 
-    if ! $jar; then
+    if [[ ! $jar ]]; then
         if [[ $cur == -* ]]; then
             # Documented as "should not be used": -internalsf, -sectionsonly
             COMPREPLY=($(compgen -W '-keystore -storepass -storetype

completions/lzip

@@ -5,7 +5,7 @@ _lzip()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
-    local decompress=false
+    local decompress=""
 
     local noargopts='!(-*|*[bmsSBdno]*)'
     # shellcheck disable=SC2254
@@ -15,7 +15,7 @@ _lzip()
             return
             ;;
         --decompress | -${noargopts}d)
-            decompress=true
+            decompress=set
             ;;
         --threads | -${noargopts}n)
             COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
@@ -35,7 +35,7 @@ _lzip()
         return
     fi
 
-    if $decompress; then
+    if [[ $decompress ]]; then
         _filedir lz
         return
     fi

completions/pack200

@@ -45,15 +45,15 @@ _pack200()
     $split && return
 
     # Check if a pack or a jar was already given.
-    local i pack=false jar=false
+    local i pack="" jar=""
     for ((i = 1; i < ${#words[@]} - 1; i++)); do
         case ${words[i]} in
-            *.pack | *.pack.gz) pack=true ;;
-            *.jar) jar=true ;;
+            *.pack | *.pack.gz) pack=set ;;
+            *.jar) jar=set ;;
         esac
     done
 
-    if ! $pack; then
+    if [[ ! $pack ]]; then
         if [[ $cur == -* ]]; then
             COMPREPLY=($(compgen -W '--no-gzip --gzip --strip-debug
                 --no-keep-file-order --segment-limit= --effort= --deflate-hint=
@@ -65,7 +65,7 @@ _pack200()
         else
             _filedir 'pack?(.gz)'
         fi
-    elif ! $jar; then
+    elif [[ ! $jar ]]; then
         _filedir jar
     fi
 } &&

completions/pytest

@@ -103,16 +103,16 @@ _pytest()
 
     if [[ $cur == *.py::*:* ]]; then
         local file=${cur/.py:*/.py}
-        local class=${cur#*.py::} in_class=false
+        local class=${cur#*.py::} in_class=""
         local line
         class=${class%%:*}
         while IFS= read -r line; do
             if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
-                in_class=true
+                in_class=set
             elif [[ $line =~ ^class[[:space:]] ]]; then
-                in_class=false
+                in_class=""
             fi
-            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+            if [[ $in_class && $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
                 COMPREPLY+=(${BASH_REMATCH[2]})
             fi
         done 2>/dev/null <"$file"

completions/ssh

@@ -480,16 +480,16 @@ _comp_xfunc_ssh_scp_local_files()
 {
     local IFS=$'\n'
 
-    local dirsonly=false
+    local dirsonly=""
     if [[ ${1-} == -d ]]; then
-        dirsonly=true
+        dirsonly=set
         shift
     fi
 
     local files
     _comp_expand_glob files '"$cur"*'
     ((${#files[@]})) || return 0
-    if $dirsonly; then
+    if [[ $dirsonly ]]; then
         COMPREPLY+=($(command ls -aF1dL "${files[@]}" 2>/dev/null |
             command sed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" -e '/[^\/]$/d' \
                 -e "s/^/${1-}/"))