File tree 5 files changed +20
-14
lines changed
5 files changed +20
-14
lines changed Original file line number Diff line number Diff line change @@ -1099,12 +1099,12 @@ _parse_help()
1099
1099
1100
1100
local cmd=$1
1101
1101
local line rc=1
1102
- {
1102
+ (
1103
1103
case $cmd in
1104
- -) cat ;;
1105
- *) LC_ALL=C "$(dequote " $cmd ") " ${2:- --help} 2 >& 1 ;;
1104
+ -) exec cat ;;
1105
+ *) _comp_dequote " $cmd " && LC_ALL=C "$ret " ${2:- --help} 2 >& 1 ;;
1106
1106
esac
1107
- } |
1107
+ ) |
1108
1108
while read -r line; do
1109
1109
1110
1110
[[ $line == *([[:blank:]])-* ]] || continue
@@ -1136,12 +1136,12 @@ _parse_usage()
1136
1136
1137
1137
local cmd=$1
1138
1138
local line match option i char rc=1
1139
- {
1139
+ (
1140
1140
case $cmd in
1141
- -) cat ;;
1142
- *) LC_ALL=C "$(dequote " $cmd ") " ${2:- --usage} 2 >& 1 ;;
1141
+ -) exec cat ;;
1142
+ *) _comp_dequote " $cmd " && LC_ALL=C "$ret " ${2:- --usage} 2 >& 1 ;;
1143
1143
esac
1144
- } |
1144
+ ) |
1145
1145
while read -r line; do
1146
1146
1147
1147
while [[ $line =~ \[[[:space:]]*(-[^]]+)[[:space:]]*\] ]]; do
Original file line number Diff line number Diff line change @@ -20,11 +20,12 @@ _muttrc()
20
20
set -- " ${words[@]} "
21
21
while (( $# > 0 )) ; do
22
22
if [[ $1 == -F* ]]; then
23
+ local ret
23
24
if (( ${# 1} > 2 )) ; then
24
- muttrc= " $( dequote " ${1: 2} " ) "
25
+ _comp_dequote " ${1: 2} " && muttrc= $ret
25
26
else
26
27
shift
27
- [[ $1 ]] && muttrc= " $( dequote " $1 " ) "
28
+ [[ $1 ]] && _comp_dequote " $1 " && muttrc= $ret
28
29
fi
29
30
break
30
31
fi
Original file line number Diff line number Diff line change @@ -49,7 +49,9 @@ _pkgadd()
49
49
done
50
50
pkginst_list=" ${tmplist[*]} "
51
51
else
52
- pkginst_list=" $( strings " $( dequote $device ) " |
52
+ local ret
53
+ _comp_dequote " $device "
54
+ pkginst_list=" $( strings " $ret " |
53
55
command grep ^PKG= | sort -u | cut -d= -f2) "
54
56
fi
55
57
COMPREPLY=($( compgen -W " $pkginst_list " -- ${cur} ) )
Original file line number Diff line number Diff line change @@ -29,7 +29,9 @@ _pkgutil()
29
29
local catalog=$( _pkgutil_url2catalog " $url " )
30
30
catalog_files=(" $catalog " )
31
31
elif [[ ${words[i]} == --config ]]; then
32
- configuration_files=(" $( dequote ${words[i + 1]} ) " )
32
+ local ret
33
+ _comp_dequote " ${words[i + 1]} "
34
+ [[ ${ret-} ]] && configuration_files=(" $ret " )
33
35
elif [[ ${words[i]} == -@ ([iurdacUS]| -install| -upgrade| -remove| -download| -available| -compare| -catalog| -stream) ]]; then
34
36
command=" ${words[i]} "
35
37
fi
Original file line number Diff line number Diff line change @@ -233,11 +233,12 @@ _ssh_configfile()
233
233
set -- " ${words[@]} "
234
234
while (( $# > 0 )) ; do
235
235
if [[ $1 == -F* ]]; then
236
+ local ret
236
237
if (( ${# 1} > 2 )) ; then
237
- configfile= " $( dequote " ${1: 2} " ) "
238
+ _comp_dequote " ${1: 2} " && configfile= $ret
238
239
else
239
240
shift
240
- [[ ${1-} ]] && configfile= " $( dequote " $1 " ) "
241
+ [[ ${1-} ]] && _comp_dequote " $1 " && configfile= $ret
241
242
fi
242
243
break
243
244
fi
You can’t perform that action at this time.
0 commit comments