refactor: clean up old IFS/noglob handling

scop · May 3, 2023 · 878d7db · 878d7db
1 parent f651c9d
commit 878d7db
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 18 deletions.
diff --git a/completions/7z b/completions/7z
@@ -29,10 +29,7 @@ _comp_cmd_7z()
                 COMPREPLY=($(compgen -P"$opt" -W '@ ! r@ r-@ r0@ r! r-! r0!' \
                     -- "$cur"))
             elif [[ $cur == ?(r@(-|0|))@* ]]; then
-                local IFS=$' \t\n' reset=$(shopt -po noglob)
-                set -o noglob
                 _comp_compgen -c "${cur#*@}" -- -P"${opt}${cur%%@*}@" -f
-                $reset
                 compopt -o filenames
             fi
             return
@@ -46,13 +43,8 @@ _comp_cmd_7z()
             return
             ;;
         -o* | -w?*)
-            local reset=$(shopt -po noglob)
-            set -o noglob
             compopt -o filenames
-            local IFS=$'\n'
             _comp_compgen -c "${cur:2}" -- -d -P"${cur:0:2}" -S/
-            _comp_unlocal IFS
-            $reset
             compopt -o nospace
             return
             ;;

diff --git a/completions/_su b/completions/_su
@@ -19,7 +19,6 @@ _comp_cmd_su()
             return
             ;;
         -c | --command | --session-command)
-            local IFS=$'\n'
             compopt -o filenames
             _comp_compgen -- -d -c
             return

diff --git a/completions/_umount.linux b/completions/_umount.linux
@@ -27,9 +27,7 @@ _comp_cmd_umount__reply_compgen_array()
     ecur=${ecur//\'/\\\'}
 
     # Actually generate completions.
-    local IFS=$'\n'
     _comp_compgen -c "${ecur}" -- -W "$wlist"
-    _comp_unlocal IFS
 }
 
 # Unescape strings in the linux fstab(5) format (with octal escapes).

diff --git a/completions/help b/completions/help
@@ -10,7 +10,6 @@ _comp_cmd_help()
         return
     fi
 
-    local IFS=$'\t\n'
     _comp_compgen -- -A helptopic
     ((${#COMPREPLY[*]} != 1)) || printf -v "COMPREPLY[0]" %q "$COMPREPLY"
 } &&

diff --git a/completions/hunspell b/completions/hunspell
@@ -15,7 +15,6 @@ _comp_cmd_hunspell()
             if ((${#dicts[@]})); then
                 dicts=("${dicts[@]##*/}")
                 dicts=("${dicts[@]%.dic}")
-                local IFS=$'\n'
                 _comp_compgen -- -W '"${dicts[@]}"'
             fi
             return

diff --git a/completions/mysql b/completions/mysql
@@ -7,7 +7,6 @@ _comp_xfunc_mysql_character_sets()
     charsets+=(utf8)
     charsets=("${charsets[@]##*/}")
     charsets=("${charsets[@]%.xml}")
-    local IFS=$'\n'
     _comp_compgen -a -- -W '"${charsets[@]}"' -X ''
 }
 

diff --git a/completions/perl b/completions/perl
@@ -33,7 +33,6 @@ _comp_cmd_perl()
                 return
                 ;;
             -*[Ix])
-                local IFS=$'\n'
                 compopt -o filenames
                 _comp_compgen -- -d "$optPrefix" $optSuffix
                 return
@@ -78,7 +77,6 @@ _comp_cmd_perl()
     # Likewise, `-I' also accepts a space between option and argument
     # and it takes a directory as value.
     elif [[ $prev == -I ]]; then
-        local IFS=$'\n'
         compopt -o filenames
         # shellcheck disable=SC2086
         _comp_compgen -- -d ${optPrefix-} ${optSuffix-}

diff --git a/completions/vpnc b/completions/vpnc
@@ -72,7 +72,6 @@ _vpnc()
         if ((${#configs[@]})); then
             configs=("${configs[@]##*/}")
             configs=("${configs[@]%.conf}")
-            local IFS=$'\n'
             compopt -o filenames
             _comp_compgen -- -W '"${configs[@]}"'
         fi

diff --git a/completions/xdg-mime b/completions/xdg-mime
@@ -59,7 +59,6 @@ _comp_cmd_xdg_mime()
                 _comp_expand_glob desktops '/usr/share/applications/*.desktop'
                 if ((${#desktops[@]})); then
                     desktops=("${desktops[@]##*/}")
-                    local IFS=$'\n'
                     _comp_compgen -- -W '"${desktops[@]}"'
                 fi
             else