fix: quote other boolean variables for custom IFS

akinomyoga · akinomyoga · commit 19fb781300b2 · 2023-04-08T13:53:17.000+09:00
diff --git a/bash_completion b/bash_completion
@@ -799,7 +799,7 @@ _comp_delimited()
     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.
diff --git a/completions/_mount.linux b/completions/_mount.linux
@@ -24,7 +24,7 @@ _comp_cmd_mount()
                 proc qnx4 ramfs reiserfs romfs squashfs smbfs sysv tmpfs ubifs
                 udf ufs umsdos usbfs vfat xfs' -- "$cur"))
             _fstypes
-            $split && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
+            "$split" && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
             return
             ;;
         --bind | -B | --rbind | -R)
@@ -206,7 +206,7 @@ _comp_cmd_mount()
             esac
             # COMP_WORDBREAKS is a real pain in the ass
             prev="${prev##*["$COMP_WORDBREAKS"]}"
-            $split && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
+            "$split" && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
diff --git a/completions/_umount.linux b/completions/_umount.linux
@@ -113,7 +113,7 @@ _comp_cmd_umount()
                 ramfs reiserfs romfs squashfs smbfs sysv tmpfs ubifs udf ufs
                 umsdos usbfs vfat xfs' -- "$cur"))
             _fstypes
-            $split && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
+            "$split" && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
             return
             ;;
         -O)
diff --git a/completions/configure b/completions/configure
@@ -20,7 +20,7 @@ _configure()
             ;;
     esac
 
-    if $split || [[ $cur != -* ]]; then
+    if "$split" || [[ $cur != -* ]]; then
         _filedir
         return
     fi
diff --git a/completions/cppcheck b/completions/cppcheck
@@ -26,7 +26,7 @@ _cppcheck()
             COMPREPLY=($(compgen -W 'all warning style performance
                 portability information unusedFunction missingInclude' \
                 -- "$cur"))
-            $split && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
+            "$split" && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
             return
             ;;
         --error-exitcode)
@@ -62,7 +62,7 @@ _cppcheck()
             return
             ;;
         -rp | --relative-paths)
-            if $split; then # -rp without argument is allowed
+            if "$split"; then # -rp without argument is allowed
                 _filedir -d
                 return
             fi
diff --git a/completions/export b/completions/export
@@ -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
diff --git a/completions/find b/completions/find
@@ -71,7 +71,7 @@ _comp_cmd_find()
     done
 
     # handle case where first parameter is not a dash option
-    if ! $exprfound && [[ $cur != [-\(\),\!]* ]]; then
+    if ! "$exprfound" && [[ $cur != [-\(\),\!]* ]]; then
         _filedir -d
         return
     fi
diff --git a/completions/fio b/completions/fio
@@ -118,7 +118,7 @@ _comp_cmd_fio()
                     local line="" in_values=false
                     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
diff --git a/completions/idn b/completions/idn
@@ -18,7 +18,7 @@ _idn()
             ;;
     esac
 
-    if ! $split && [[ $cur == -* ]]; then
+    if ! "$split" && [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
diff --git a/completions/jarsigner b/completions/jarsigner
@@ -40,7 +40,7 @@ _jarsigner()
         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
diff --git a/completions/lzip b/completions/lzip
@@ -35,7 +35,7 @@ _lzip()
         return
     fi
 
-    if $decompress; then
+    if "$decompress"; then
         _filedir lz
         return
     fi
diff --git a/completions/pack200 b/completions/pack200
@@ -53,7 +53,7 @@ _pack200()
         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
 } &&
diff --git a/completions/pytest b/completions/pytest
@@ -112,7 +112,7 @@ _pytest()
             elif [[ $line =~ ^class[[:space:]] ]]; then
                 in_class=false
             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"
diff --git a/completions/ssh b/completions/ssh
@@ -489,7 +489,7 @@ _comp_xfunc_ssh_scp_local_files()
     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-}/"))
diff --git a/completions/tar b/completions/tar
@@ -603,7 +603,7 @@ _gtar()
                 # if there is some unknown option with '=', for example
                 # (literally) user does --nonexistent=<TAB>, we do not want
                 # continue also
-                $split && break
+                "$split" && break
 
                 # Most probably, when code goes here, the PREV variable contains
                 # some string from "$long_arg_none" and we want continue.
diff --git a/completions/timeout b/completions/timeout
@@ -8,7 +8,7 @@ _timeout()
     local noargopts='!(-*|*[ks]*)'
     for ((i = 1; i <= COMP_CWORD; i++)); do
         if [[ ${COMP_WORDS[i]} != -* && ${COMP_WORDS[i - 1]} != = ]]; then
-            if $found; then
+            if "$found"; then
                 _comp_command_offset $i
                 return
             fi
diff --git a/completions/unpack200 b/completions/unpack200
@@ -33,15 +33,15 @@ _unpack200()
         esac
     done
 
-    if ! $pack; then
+    if ! "$pack"; then
         if [[ $cur == -* ]]; then
             COMPREPLY=($(compgen -W '--deflate-hint= --remove-pack-file
                 --verbose --quiet --log-file= --help --version' -- "$cur"))
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir 'pack?(.gz)'
         fi
-    elif ! $jar; then
+    elif ! "$jar"; then
         _filedir jar
     fi
 } &&
