Skip to content

Commit af1cf9f

Browse files
committed
refactor: clean up old IFS/noglob handling
1 parent ac88694 commit af1cf9f

File tree

9 files changed

+1
-19
lines changed

9 files changed

+1
-19
lines changed

completions/7z

-8
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ _comp_cmd_7z()
2929
COMPREPLY=($(compgen -P"$opt" -W '@ ! r@ r-@ r0@ r! r-! r0!' \
3030
-- "$cur"))
3131
elif [[ $cur == ?(r@(-|0|))@* ]]; then
32-
local IFS=$' \t\n' reset=$(shopt -po noglob)
33-
set -o noglob
3432
_comp_compgen -c "${cur#*@}" -- -P"${opt}${cur%%@*}@" -f
35-
$reset
3633
compopt -o filenames
3734
fi
3835
return
@@ -46,13 +43,8 @@ _comp_cmd_7z()
4643
return
4744
;;
4845
-o* | -w?*)
49-
local reset=$(shopt -po noglob)
50-
set -o noglob
5146
compopt -o filenames
52-
local IFS=$'\n'
5347
_comp_compgen -c "${cur:2}" -- -d -P"${cur:0:2}" -S/
54-
_comp_unlocal IFS
55-
$reset
5648
compopt -o nospace
5749
return
5850
;;

completions/_su

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ _comp_cmd_su()
1919
return
2020
;;
2121
-c | --command | --session-command)
22-
local IFS=$'\n'
2322
compopt -o filenames
2423
_comp_compgen -- -d -c
2524
return

completions/_umount.linux

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ _comp_cmd_umount__reply_compgen_array()
2727
ecur=${ecur//\'/\\\'}
2828

2929
# Actually generate completions.
30-
local IFS=$'\n'
31-
_comp_compgen -c "${ecur}" -- -W "$wlist"
32-
_comp_unlocal IFS
30+
_comp_compgen -lc "${ecur}" -- -W "$wlist"
3331
}
3432

3533
# Unescape strings in the linux fstab(5) format (with octal escapes).

completions/help

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ _comp_cmd_help()
1010
return
1111
fi
1212

13-
local IFS=$'\t\n'
1413
_comp_compgen -- -A helptopic
1514
((${#COMPREPLY[*]} != 1)) || printf -v "COMPREPLY[0]" %q "$COMPREPLY"
1615
} &&

completions/hunspell

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ _comp_cmd_hunspell()
1515
if ((${#dicts[@]})); then
1616
dicts=("${dicts[@]##*/}")
1717
dicts=("${dicts[@]%.dic}")
18-
local IFS=$'\n'
1918
_comp_compgen -- -W '"${dicts[@]}"'
2019
fi
2120
return

completions/mysql

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ _comp_xfunc_mysql_character_sets()
77
charsets+=(utf8)
88
charsets=("${charsets[@]##*/}")
99
charsets=("${charsets[@]%.xml}")
10-
local IFS=$'\n'
1110
_comp_compgen -a -- -W '"${charsets[@]}"' -X ''
1211
}
1312

completions/perl

-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ _comp_cmd_perl()
3333
return
3434
;;
3535
-*[Ix])
36-
local IFS=$'\n'
3736
compopt -o filenames
3837
_comp_compgen -- -d "$optPrefix" $optSuffix
3938
return
@@ -78,7 +77,6 @@ _comp_cmd_perl()
7877
# Likewise, `-I' also accepts a space between option and argument
7978
# and it takes a directory as value.
8079
elif [[ $prev == -I ]]; then
81-
local IFS=$'\n'
8280
compopt -o filenames
8381
# shellcheck disable=SC2086
8482
_comp_compgen -- -d ${optPrefix-} ${optSuffix-}

completions/vpnc

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ _vpnc()
7272
if ((${#configs[@]})); then
7373
configs=("${configs[@]##*/}")
7474
configs=("${configs[@]%.conf}")
75-
local IFS=$'\n'
7675
compopt -o filenames
7776
_comp_compgen -- -W '"${configs[@]}"'
7877
fi

completions/xdg-mime

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ _comp_cmd_xdg_mime()
5959
_comp_expand_glob desktops '/usr/share/applications/*.desktop'
6060
if ((${#desktops[@]})); then
6161
desktops=("${desktops[@]##*/}")
62-
local IFS=$'\n'
6362
_comp_compgen -- -W '"${desktops[@]}"'
6463
fi
6564
else

0 commit comments

Comments
 (0)