refactor: switch from if "$var" to if [[ $var ]]

akinomyoga · akinomyoga · commit eab59528464e · 2023-04-22T13:12:23.000+09:00
diff --git a/bash_completion b/bash_completion
@@ -339,12 +339,12 @@ _comp_expand_glob()
 #   generated.
 _comp_split()
 {
-    local _append=false IFS=$' \t\n'
+    local _append="" IFS=$' \t\n'
 
     local OPTIND=1 OPTARG="" OPTERR=0 _opt
     while getopts ':alF:' _opt "$@"; do
         case $_opt in
-            a) _append=true ;;
+            a) _append="set" ;;
             l) IFS=$'\n' ;;
             F) IFS=$OPTARG ;;
             *)
@@ -367,7 +367,7 @@ _comp_split()
     set -o noglob
 
     local _old_size _new_size
-    if "$_append"; then
+    if [[ $_append ]]; then
         eval "$1+=()" # in case $1 is unset
         eval "_old_size=\${#$1[@]}"
         eval "$1+=(\$2)"
@@ -409,13 +409,13 @@ _comp_split()
 #   array instead.
 _comp_compgen()
 {
-    local _append=false IFS=$' \t\n'
+    local _append="" IFS=$' \t\n'
     local -a _split_options=(-l)
 
     local OPTIND=1 OPTARG="" OPTERR=0 _opt
     while getopts ':alF:' _opt "$@"; do
         case $_opt in
-            a) _append=true _split_options+=(-a) ;;
+            a) _append="set" _split_options+=(-a) ;;
             l) IFS=$'\n' ;;
             F) IFS=$OPTARG ;;
             *)
@@ -447,7 +447,7 @@ _comp_compgen()
     local _result
     _result=$(compgen "${@:2}") || {
         local _status=$?
-        if "$_append"; then
+        if [[ $_append ]]; then
             # make sure existence of variable
             eval -- "$1+=()"
         else
diff --git a/completions/_adb b/completions/_adb
@@ -25,16 +25,16 @@ _comp_cmd_adb()
             ;;
     esac
 
-    local cmd has_cmd=false i
+    local cmd has_cmd="" i
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* && ${words[i - 1]} != -[sp] ]]; then
             cmd="${words[i]}"
-            has_cmd=true
+            has_cmd="set"
             break
         fi
     done
 
-    if ! "$has_cmd"; then
+    if [[ ! $has_cmd ]]; then
         local tmp=()
         if [[ ! $cur || $cur == -* ]]; then
             tmp+=($(compgen -W '$(_parse_help "$1" help)' -- "$cur"))
diff --git a/completions/_chsh b/completions/_chsh
@@ -8,13 +8,13 @@ _comp_cmd_chsh()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local word chroot="" has_chroot=false
+    local word chroot="" has_chroot=""
     for word in "${words[@]}"; do
-        if "$has_chroot"; then
+        if [[ $has_chroot ]]; then
             chroot=$word
             break
         fi
-        [[ $word != -@(R|-root) ]] || has_chroot=true
+        [[ $word != -@(R|-root) ]] || has_chroot="set"
     done
 
     case $prev in
diff --git a/completions/_udevadm b/completions/_udevadm
@@ -8,11 +8,11 @@ _comp_cmd_udevadm()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
-    local i udevcmd has_udevcmd=false
+    local i udevcmd has_udevcmd=""
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* ]]; then
             udevcmd=${words[i]}
-            has_udevcmd=true
+            has_udevcmd="set"
             break
         fi
     done
@@ -54,7 +54,7 @@ _comp_cmd_udevadm()
 
     $split && return
 
-    if ! "$has_udevcmd"; then
+    if [[ ! $has_udevcmd ]]; then
         case $cur in
             -*)
                 COMPREPLY=($(compgen -W '--help --version --debug' -- "$cur"))
diff --git a/completions/carton b/completions/carton
@@ -18,19 +18,19 @@ _carton()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
-    local i command="" has_command=false
+    local i command="" has_command=""
     for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
             -*) ;;
             *)
                 command=${words[i]}
-                has_command=true
+                has_command="set"
                 break
                 ;;
         esac
     done
 
-    if ! "$has_command"; then
+    if [[ ! $has_command ]]; then
         _carton_commands "$1"
         return
     fi
@@ -40,7 +40,7 @@ _carton()
             return
             ;;
         --help | -h)
-            "$has_command" || _carton_commands "$1"
+            [[ $has_command ]] || _carton_commands "$1"
             return
             ;;
         --cpanfile)
diff --git a/completions/cvs b/completions/cvs
@@ -53,7 +53,7 @@ _cvs()
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
 
-    local count mode="" i cvsroot="" has_cvsroot=false cvsroots pwd
+    local count mode="" i cvsroot="" has_cvsroot="" cvsroots pwd
     local -a flags files entries changed newremoved
 
     local noargopts='!(-*|*[d]*)'
@@ -74,7 +74,7 @@ _cvs()
                 -${noargopts}d)
                     mode=cvsroot
                     cvsroot=${words[count + 1]}
-                    has_cvsroot=true
+                    has_cvsroot="set"
                     ;;
                 add | ad | new)
                     mode=add
@@ -232,7 +232,7 @@ _cvs()
             esac
 
             if [[ $cur != -* ]]; then
-                ! "$has_cvsroot" && cvsroot=${CVSROOT-}
+                [[ ! $has_cvsroot ]] && cvsroot=${CVSROOT-}
                 COMPREPLY=($(cvs -d "$cvsroot" co -c 2>/dev/null |
                     awk '{print $1}'))
                 ((${#COMPREPLY[@]})) &&
@@ -317,7 +317,7 @@ _cvs()
             esac
 
             if [[ $cur != -* ]]; then
-                ! "$has_cvsroot" && cvsroot=${CVSROOT-}
+                [[ ! $has_cvsroot ]] && cvsroot=${CVSROOT-}
                 COMPREPLY=($(cvs -d "$cvsroot" co -c | awk '{print $1}'))
                 ((${#COMPREPLY[@]})) &&
                     COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "$cur"))
@@ -339,7 +339,7 @@ _cvs()
 
             if [[ $cur != -* ]]; then
                 # starts with same algorithm as checkout
-                ! "$has_cvsroot" && cvsroot=${CVSROOT-}
+                [[ ! $has_cvsroot ]] && cvsroot=${CVSROOT-}
                 local prefix=${cur%/*}
                 if [[ -r ${cvsroot}/${prefix} ]]; then
                     _cvs_modules
diff --git a/completions/dmypy b/completions/dmypy
@@ -15,11 +15,11 @@ _comp_cmd_dmypy()
             ;;
     esac
 
-    local cmd has_cmd=false i
+    local cmd has_cmd="" i
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* && ${words[i - 1]} != --status-file ]]; then
             cmd=${words[i]}
-            has_cmd=true
+            has_cmd="set"
             break
         fi
     done
@@ -36,7 +36,7 @@ _comp_cmd_dmypy()
         return
     fi
 
-    if ! "$has_cmd"; then
+    if [[ ! $has_cmd ]]; then
         local cmds=$("$1" --help 2>&1 |
             command sed -ne '/positional arguments/{p;n;p;q;}' |
             command sed -ne 's/{\(.*\)}/\1/p')
diff --git a/completions/getent b/completions/getent
@@ -6,7 +6,7 @@ _comp_cmd_getent()
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[s]*)'
-    local i db has_db=false
+    local i db has_db=""
     for ((i = 1; i < cword; i++)); do
         # shellcheck disable=SC2254
         case ${words[i]} in
@@ -21,7 +21,7 @@ _comp_cmd_getent()
             *)
                 # First non-option value is the db
                 db=${words[i]}
-                has_db=true
+                has_db="set"
                 break
                 ;;
         esac
@@ -69,7 +69,7 @@ _comp_cmd_getent()
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
-    elif ! "$has_db"; then
+    elif [[ ! $has_db ]]; then
         COMPREPLY=($(compgen -W 'passwd group hosts services protocols
             networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc
             shadow gshadow' -- "$cur"))
diff --git a/completions/ip b/completions/ip
@@ -43,16 +43,16 @@ _ip()
             ;;
     esac
 
-    local subcword cmd="" has_cmd=false subcmd=""
+    local subcword cmd="" has_cmd="" subcmd=""
     for ((subcword = 1; subcword < ${#words[@]} - 1; subcword++)); do
         [[ ${words[subcword]} == -b?(atch) ]] && return
-        "$has_cmd" && subcmd=${words[subcword]} && break
+        [[ $has_cmd ]] && subcmd=${words[subcword]} && break
         [[ ${words[subcword]} != -* &&
             ${words[subcword - 1]} != -@(f?(amily)|rc?(vbuf)) ]] &&
-            cmd=${words[subcword]} has_cmd=true
+            cmd=${words[subcword]} has_cmd="set"
     done
 
-    if ! "$has_cmd"; then
+    if [[ ! $has_cmd ]]; then
         case $cur in
             -*)
                 local force=""
diff --git a/completions/ipmitool b/completions/ipmitool
@@ -67,15 +67,15 @@ _ipmitool()
     local cmds=(raw i2c spd lan chassis power event mc sdr sensor fru gendev
         sel pef sol tsol isol user channel session sunoem kontronoem picmg fwum
         firewall shell exec set hpm ekanalyzer)
-    local i c cmd="" has_cmd=false subcmd
+    local i c cmd="" has_cmd="" subcmd
     for ((i = 1; i < ${#words[@]} - 1; i++)); do
-        "$has_cmd" && subcmd=${words[i]} && break
+        [[ $has_cmd ]] && subcmd=${words[i]} && break
         for c in "${cmds[@]}"; do
-            [[ ${words[i]} == "$c" ]] && cmd=$c has_cmd=true && break
+            [[ ${words[i]} == "$c" ]] && cmd=$c has_cmd="set" && break
         done
     done
 
-    if ! "$has_cmd"; then
+    if [[ ! $has_cmd ]]; then
         COMPREPLY=($(compgen -W '"${cmds[@]}"' -- "$cur"))
         return
     fi
diff --git a/completions/koji b/completions/koji
@@ -37,11 +37,11 @@ _koji()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
-    local commandix command="" has_command=false
+    local commandix command="" has_command=""
     for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
-            has_command=true
+            has_command="set"
             break
         fi
     done
@@ -108,7 +108,7 @@ _koji()
 
     $split && return
 
-    if "$has_command"; then
+    if [[ $has_command ]]; then
         if [[ $cur == -* ]]; then
             COMPREPLY=($(compgen -W \
                 '$(_parse_help "$1" "$command --help")' -- "$cur"))
@@ -238,7 +238,7 @@ _koji()
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
-    elif ! "$has_command"; then
+    elif [[ ! $has_command ]]; then
         COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
             awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
diff --git a/completions/mr b/completions/mr
@@ -21,17 +21,17 @@ _mr()
 
     # Determine if user has entered an `mr` command. Used to block top-level
     # (option and command) completions.
-    local cmd has_cmd=false i
+    local cmd has_cmd="" i
     for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ $commands == *"${words[i]}"* ]]; then
             cmd="${words[i]}"
-            has_cmd=true
+            has_cmd="set"
             break
         fi
     done
 
     # Complete options for specific commands.
-    if "$has_cmd"; then
+    if [[ $has_cmd ]]; then
         case $cmd in
             bootstrap)
                 _filedir
diff --git a/completions/route b/completions/route
@@ -16,11 +16,11 @@ _route()
     local opt found i
     for opt in add del -host -net netmask metric mss window irtt reject mod \
         dyn reinstate dev default gw; do
-        found=false
+        found=""
         for ((i = 1; i < ${#words[@]} - 1; i++)); do
-            [[ ${words[i]} == "$opt" ]] && found=true && break
+            [[ ${words[i]} == "$opt" ]] && found="set" && break
         done
-        $found || COMPREPLY+=("$opt")
+        [[ $found ]] || COMPREPLY+=("$opt")
     done
 
     ((${#COMPREPLY[@]})) &&
diff --git a/completions/secret-tool b/completions/secret-tool
@@ -8,14 +8,14 @@ _secret_tool()
     $split && return
 
     local -i i
-    local mode="" has_mode=false word
+    local mode="" has_mode="" word
     for i in ${!words[*]}; do
         if [[ $i -gt 0 && ${words[i]} != -* ]]; then
-            ((i != cword)) && mode=${words[i]} has_mode=true
+            ((i != cword)) && mode=${words[i]} has_mode="set"
             break
         fi
     done
-    if ! "$has_mode"; then
+    if [[ ! $has_mode ]]; then
         local -a modes
         modes=($("$1" nonexistent-mode 2>&1 |
             while read -r first second third rest; do
diff --git a/completions/sysbench b/completions/sysbench
@@ -105,23 +105,23 @@ _sysbench()
     esac
 
     # find out which test we're running
-    local i test="" has_test=false
+    local i test="" has_test=""
     for ((i = 1; i < ${#words[@]} - 1; i++)); do
         # TODO --test= is deprecated, bare test name preferred
         if [[ ${words[i]} == --test* ]]; then
             test=${words[i]#*=}
-            has_test=true
+            has_test="set"
             break
         fi
     done
 
     local opts=$(_parse_help "$1")
-    if "$has_test"; then
+    if [[ $has_test ]]; then
         local help=($(_parse_help "$1" "--test=$test help"))
         opts="${opts/--test=/} ${help[*]} prepare run cleanup help version"
     fi
 
-    if [[ $cur == -* ]] || ! "$has_test"; then
+    if [[ $cur == -* || ! $has_test ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
diff --git a/completions/useradd b/completions/useradd
diff --git a/completions/usermod b/completions/usermod
diff --git a/completions/wtf b/completions/wtf
diff --git a/completions/xrandr b/completions/xrandr
