?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
component(developer/golang-123): Add Component
[oi-userland.git] / components / shell / bash-completion / patches / 01-use-gnu-grep-sed.patch
blobf761676be2e0942c5e0a4ac7b2150e23aac1dbfb
1 Result of following commands:
2
3 cp -a bash-completion-2.15.0 bash-completion-2.15.0.old
4
5 find bash-completion-2.15.0/completions/ -type f -exec sed -i 's/ grep / ggrep /g' {} \;
6 find bash-completion-2.15.0/completions/ -type f -exec sed -i 's/ sed / gsed /g' {} \;
7
8 find bash-completion-2.15.0/bash_completion -type f -exec sed -i 's/ grep / ggrep /g' {} \;
9 find bash-completion-2.15.0/bash_completion -type f -exec sed -i 's/ sed / gsed /g' {} \;
10
11 gdiff -pruN bash-completion-2.15.0.old bash-completion-2.15.0 | less
12
13 And check the result.
14 diff -pruN bash-completion-2.15.0.old/bash_completion bash-completion-2.15.0/bash_completion
15 --- bash-completion-2.15.0.old/bash_completion 2024-11-24 23:21:02.000000000 +0100
16 +++ bash-completion-2.15.0/bash_completion 2024-11-30 21:21:33.722327150 +0100
17 @@ -1709,7 +1709,7 @@ _comp_compgen_mac_addresses()
18 _comp_compgen -v addresses split -- "$(
19 {
20 LC_ALL=C ifconfig -a || ip -c=never link show || ip link show
21 - } 2>/dev/null | command sed -ne \
22 + } 2>/dev/null | command gsed -ne \
23 "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($_re\)[[:space:]].*/\1/p" -ne \
24 "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($_re\)[[:space:]]*$/\1/p" -ne \
25 "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($_re\)[[:space:]].*|\2|p" -ne \
26 @@ -1720,13 +1720,13 @@ _comp_compgen_mac_addresses()
27 _comp_compgen -av addresses split -- "$(
28 {
29 arp -an || ip -c=never neigh show || ip neigh show
30 - } 2>/dev/null | command sed -ne \
31 + } 2>/dev/null | command gsed -ne \
32 "s/.*[[:space:]]\($_re\)[[:space:]].*/\1/p" -ne \
33 "s/.*[[:space:]]\($_re\)[[:space:]]*$/\1/p"
34 )"
35
36 # /etc/ethers
37 - _comp_compgen -av addresses split -- "$(command sed -ne \
38 + _comp_compgen -av addresses split -- "$(command gsed -ne \
39 "s/^[[:space:]]*\($_re\)[[:space:]].*/\1/p" /etc/ethers 2>/dev/null)"
40
41 _comp_compgen -U addresses ltrim_colon "${addresses[@]}"
42 @@ -1741,22 +1741,22 @@ _comp_compgen_configured_interfaces()
43 if [[ -f /etc/debian_version ]]; then
44 # Debian system
45 _comp_expand_glob files '/etc/network/interfaces /etc/network/interfaces.d/*' || return 0
46 - _comp_compgen -U files split -- "$(command sed -ne \
47 + _comp_compgen -U files split -- "$(command gsed -ne \
48 's|^iface \([^ ]\{1,\}\).*$|\1|p' "${files[@]}" 2>/dev/null)"
49 elif [[ -f /etc/SuSE-release ]]; then
50 # SuSE system
51 _comp_expand_glob files '/etc/sysconfig/network/ifcfg-*' || return 0
52 _comp_compgen -U files split -- "$(printf '%s\n' "${files[@]}" |
53 - command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
54 + command gsed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
55 elif [[ -f /etc/pld-release ]]; then
56 # PLD Linux
57 _comp_compgen -U files split -- "$(command ls -B /etc/sysconfig/interfaces |
58 - command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
59 + command gsed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
60 else
61 # Assume Red Hat
62 _comp_expand_glob files '/etc/sysconfig/network-scripts/ifcfg-*' || return 0
63 _comp_compgen -U files split -- "$(printf '%s\n' "${files[@]}" |
64 - command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
65 + command gsed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')"
66 fi
67 }
68
69 @@ -1781,7 +1781,7 @@ _comp_compgen_ip_addresses()
70 _comp_compgen -v addrs split -- "$({
71 LC_ALL=C ifconfig -a || ip -c=never addr show || ip addr show
72 } 2>/dev/null |
73 - command sed -e 's/[[:space:]]addr:/ /' -ne \
74 + command gsed -e 's/[[:space:]]addr:/ /' -ne \
75 "s|.*inet${_n}[[:space:]]\{1,\}\([^[:space:]/]*\).*|\1|p")" ||
76 return
77
78 @@ -1922,17 +1922,17 @@ if [[ $OSTYPE == *@(solaris|aix)* ]]; th
79 # This function completes on process IDs.
80 _comp_compgen_pids()
81 {
82 - _comp_compgen_split -- "$(command ps -efo pid | command sed 1d)"
83 + _comp_compgen_split -- "$(command ps -efo pid | command gsed 1d)"
84 }
85
86 _comp_compgen_pgids()
87 {
88 - _comp_compgen_split -- "$(command ps -efo pgid | command sed 1d)"
89 + _comp_compgen_split -- "$(command ps -efo pgid | command gsed 1d)"
90 }
91 _comp_compgen_pnames()
92 {
93 _comp_compgen_split -X '<defunct>' -- "$(command ps -efo comm |
94 - command sed -e 1d -e 's:.*/::' -e 's/^-//' | sort -u)"
95 + command gsed -e 1d -e 's:.*/::' -e 's/^-//' | sort -u)"
96 }
97 else
98 _comp_compgen_pids()
99 @@ -1948,7 +1948,7 @@ else
100 {
101 local -a procs=()
102 if [[ ${1-} == -s ]]; then
103 - _comp_split procs "$(command ps ax -o comm | command sed -e 1d)"
104 + _comp_split procs "$(command ps ax -o comm | command gsed -e 1d)"
105 else
106 # Some versions of ps don't support "command", but do "comm", e.g.
107 # some busybox ones. Fall back
108 @@ -2090,7 +2090,7 @@ _comp_complete_service()
109 else
110 local sysvdirs
111 _comp_sysvdirs || return 1
112 - _comp_compgen_split -l -- "$(command sed -e 'y/|/ /' \
113 + _comp_compgen_split -l -- "$(command gsed -e 'y/|/ /' \
114 -ne 's/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p' \
115 "${sysvdirs[0]}/${prev##*/}" 2>/dev/null) start stop"
116 fi
117 @@ -2120,7 +2120,7 @@ _comp_compgen_kernel_modules()
118 {
119 local _modpath=/lib/modules/$1
120 _comp_compgen_split -- "$(command ls -RL "$_modpath" 2>/dev/null |
121 - command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p' \
122 + command gsed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p' \
123 -e 's/^\(.*\)\.ko\.zst$/\1/p')"
124 }
125
126 @@ -2443,7 +2443,7 @@ _comp_compgen_dvd_devices()
127 _comp_compgen_terms()
128 {
129 _comp_compgen_split -- "$({
130 - command sed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap
131 + command gsed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap
132 {
133 toe -a || toe
134 } | _comp_awk '{ print $1 }'
135 @@ -2458,7 +2458,7 @@ _comp_try_faketty()
136 {
137 if type unbuffer &>/dev/null; then
138 unbuffer -p "$@"
139 - elif script --version 2>&1 | command grep -qF util-linux; then
140 + elif script --version 2>&1 | command ggrep -qF util-linux; then
141 # BSD and Solaris "script" do not seem to have required features
142 script -qaefc "$*" /dev/null
143 else
144 @@ -2539,7 +2539,7 @@ _comp__included_ssh_config_files()
145 # https://github.com/openssh/openssh-portable/blob/5ec5504f1d328d5bfa64280cd617c3efec4f78f3/readconf.c#L2240
146 local max_depth=16
147 while ((${#included[@]} > 0 && depth++ < max_depth)); do
148 - _comp_split include_files "$(command sed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\(.*\)$/\1/p' "${included[@]}")" || return
149 + _comp_split include_files "$(command gsed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\(.*\)$/\1/p' "${included[@]}")" || return
150 included=()
151 for i in "${include_files[@]}"; do
152 if [[ $i != [~/]* ]]; then
153 @@ -2737,7 +2737,7 @@ _comp_compgen_known_hosts__impl()
154 # append any available aliases from ssh config files
155 if [[ ${#config[@]} -gt 0 && $aliases ]]; then
156 local -a hosts
157 - if _comp_split hosts "$(command sed -ne 's/^[[:blank:]]*[Hh][Oo][Ss][Tt][[:blank:]=]\{1,\}\(.*\)$/\1/p' "${config[@]}")"; then
158 + if _comp_split hosts "$(command gsed -ne 's/^[[:blank:]]*[Hh][Oo][Ss][Tt][[:blank:]=]\{1,\}\(.*\)$/\1/p' "${config[@]}")"; then
159 _comp_compgen -av known_hosts -- -P "$prefix" \
160 -S "$suffix" -W '"${hosts[@]%%[*?%]*}"' -X '@(\!*|)'
161 fi
162 @@ -3046,7 +3046,7 @@ _comp_complete_longopt()
163 return
164 ;;
165 --+([-a-z0-9_]))
166 - local argtype=$(LC_ALL=C $1 --help 2>&1 | command sed -ne \
167 + local argtype=$(LC_ALL=C $1 --help 2>&1 | command gsed -ne \
168 "s|.*$prev\[\{0,1\}=[<[]\{0,1\}\([-A-Za-z0-9_]\{1,\}\).*|\1|p")
169 case ${argtype,,} in
170 *dir*)
171 @@ -3081,9 +3081,9 @@ _comp_complete_longopt()
172 complete -F _comp_complete_longopt \
173 a2ps awk base64 bash bc bison cat chroot colordiff cp \
174 csplit cut date df diff dir du enscript expand fmt fold gperf \
175 - grep grub head irb ld ldd less ln ls m4 mkdir mkfifo mknod \
176 + ggrep grub head irb ld ldd less ln ls m4 mkdir mkfifo mknod \
177 mv netstat nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
178 - sed seq shar sort split strip sum tac tail tee \
179 + gsed seq shar sort split strip sum tac tail tee \
180 texindex touch tr uname unexpand uniq units vdir wc who
181
182 # @since 2.12
183 diff -pruN bash-completion-2.15.0.old/completions/_adb bash-completion-2.15.0/completions/_adb
184 --- bash-completion-2.15.0.old/completions/_adb 2024-11-24 23:21:02.000000000 +0100
185 +++ bash-completion-2.15.0/completions/_adb 2024-11-30 21:20:52.392491627 +0100
186 @@ -6,7 +6,7 @@
187 _comp_cmd_adb__command_usage()
188 {
189 _comp_compgen_help - <<<"$("$1" help 2>&1 |
190 - command sed -e "/^ *\(adb \)\{0,1\} *$2 /!d;s/[]|[]/\n/g")"
191 + command gsed -e "/^ *\(adb \)\{0,1\} *$2 /!d;s/[]|[]/\n/g")"
192 }
193
194 _comp_cmd_adb()
195 @@ -57,7 +57,7 @@ _comp_cmd_adb()
196 ;;
197 forward)
198 _comp_compgen_help - <<<"$("$1" help 2>&1 |
199 - command sed -ne "s/^ *adb *forward *-/-/p")"
200 + command gsed -ne "s/^ *adb *forward *-/-/p")"
201 ;;
202 reboot)
203 _comp_compgen -- -W 'bootloader recovery'
204 diff -pruN bash-completion-2.15.0.old/completions/_mock bash-completion-2.15.0/completions/_mock
205 --- bash-completion-2.15.0.old/completions/_mock 2024-11-24 23:21:02.000000000 +0100
206 +++ bash-completion-2.15.0/completions/_mock 2024-11-30 21:20:52.079328169 +0100
207 @@ -47,7 +47,7 @@ _comp_cmd_mock()
208 # (e.g. ix86 chroot builds in x86_64 mock host)
209 # This would actually depend on what the target root
210 # can be used to build for...
211 - _comp_compgen_split -- "$(command rpm --showrc | command sed -ne \
212 + _comp_compgen_split -- "$(command rpm --showrc | command gsed -ne \
213 "s/^[[:space:]]*${regex_header}[[:space:]]*:[[:space:]]*\(.*\)/\1/p")"
214 return
215 ;;
216 diff -pruN bash-completion-2.15.0.old/completions/_modprobe bash-completion-2.15.0/completions/_modprobe
217 --- bash-completion-2.15.0.old/completions/_modprobe 2024-11-24 23:21:02.000000000 +0100
218 +++ bash-completion-2.15.0/completions/_modprobe 2024-11-30 21:20:51.931274645 +0100
219 @@ -93,7 +93,7 @@ _comp_cmd_modprobe()
220 prev=${cur%%=*}
221 cur=${cur#*=}
222 if PATH="$PATH:/sbin" modinfo -p "$module" 2>/dev/null |
223 - command grep -q "^$prev:.*(bool)"; then
224 + command ggrep -q "^$prev:.*(bool)"; then
225 local choices="on off"
226 [[ $cur ]] && choices="1 0 y Y n N on off"
227 _comp_compgen -- -W "$choices"
228 diff -pruN bash-completion-2.15.0.old/completions/_modules bash-completion-2.15.0/completions/_modules
229 --- bash-completion-2.15.0.old/completions/_modules 2024-11-24 23:21:02.000000000 +0100
230 +++ bash-completion-2.15.0/completions/_modules 2024-11-30 21:20:52.329835614 +0100
231 @@ -23,13 +23,13 @@
232
233 _comp_cmd_module__compgen_list()
234 {
235 - local modules="$(command sed 's/:/ /g' <<<"$LOADEDMODULES" | sort)"
236 + local modules="$(command gsed 's/:/ /g' <<<"$LOADEDMODULES" | sort)"
237 _comp_compgen -- -W "$modules"
238 }
239
240 _comp_cmd_module__compgen_path()
241 {
242 - local modules="$(command sed 's/:/ /g' <<<"$MODULEPATH" | sort)"
243 + local modules="$(command gsed 's/:/ /g' <<<"$MODULEPATH" | sort)"
244 _comp_compgen -- -W "$modules"
245 }
246
247 @@ -37,8 +37,8 @@ _comp_cmd_module__compgen_avail()
248 {
249 local modules="$(
250 module avail 2>&1 |
251 - command grep -E -v '^(-|$)' |
252 - xargs printf '%s\n' | command sed -e 's/(default)//g' | sort
253 + command ggrep -E -v '^(-|$)' |
254 + xargs printf '%s\n' | command gsed -e 's/(default)//g' | sort
255 )"
256 _comp_compgen -- -W "$modules"
257 }
258 @@ -53,8 +53,8 @@ _comp_cmd_module()
259 # First parameter on line -- we expect it to be a mode selection
260
261 local options
262 - options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' |
263 - _comp_awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
264 + options="$(module help 2>&1 | command ggrep -E '^[[:space:]]*\+' |
265 + _comp_awk '{print $2}' | command gsed -e 's/|/ /g' | sort)"
266
267 _comp_compgen -- -W "$options"
268
269 diff -pruN bash-completion-2.15.0.old/completions/_mount bash-completion-2.15.0/completions/_mount
270 --- bash-completion-2.15.0.old/completions/_mount 2024-11-24 23:21:02.000000000 +0100
271 +++ bash-completion-2.15.0/completions/_mount 2024-11-30 21:20:52.015786530 +0100
272 @@ -46,8 +46,8 @@ _comp_cmd_mount()
273 if [[ $host ]]; then
274 _comp_compgen -c "${cur#//"$host"}" split -P "//$host" -- "$(
275 smbclient -d 0 -NL "$host" 2>/dev/null |
276 - command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
277 - command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p'
278 + command gsed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
279 + command gsed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p'
280 )"
281 fi
282 elif [[ -r /etc/vfstab ]]; then
283 diff -pruN bash-completion-2.15.0.old/completions/_mount.linux bash-completion-2.15.0/completions/_mount.linux
284 --- bash-completion-2.15.0.old/completions/_mount.linux 2024-11-24 23:21:02.000000000 +0100
285 +++ bash-completion-2.15.0/completions/_mount.linux 2024-11-30 21:20:52.428373980 +0100
286 @@ -238,8 +238,8 @@ _comp_cmd_mount()
287 if [[ $host ]]; then
288 _comp_compgen -c "${cur#//"$host"}" split -P "//$host" -- "$(
289 smbclient -d 0 -NL "$host" 2>/dev/null |
290 - command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
291 - command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p'
292 + command gsed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
293 + command gsed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p'
294 )"
295 fi
296 fi
297 diff -pruN bash-completion-2.15.0.old/completions/_nox bash-completion-2.15.0/completions/_nox
298 --- bash-completion-2.15.0.old/completions/_nox 2024-11-24 23:21:02.000000000 +0100
299 +++ bash-completion-2.15.0/completions/_nox 2024-11-30 21:20:52.236972131 +0100
300 @@ -4,7 +4,7 @@
301 # This serves as a fallback in case the completion is not installed otherwise.
302
303 eval -- "$(
304 - pathcmd=$(type -P -- "$1" 2>/dev/null | command sed 's,/[^/]*$,,')
305 + pathcmd=$(type -P -- "$1" 2>/dev/null | command gsed 's,/[^/]*$,,')
306 [[ $pathcmd ]] && PATH=$pathcmd${PATH:+:$PATH}
307 register-python-argcomplete --shell bash "$1" 2>/dev/null ||
308 register-python-argcomplete3 --shell bash "$1" 2>/dev/null
309 diff -pruN bash-completion-2.15.0.old/completions/_yum bash-completion-2.15.0/completions/_yum
310 --- bash-completion-2.15.0.old/completions/_yum 2024-11-24 23:21:02.000000000 +0100
311 +++ bash-completion-2.15.0/completions/_yum 2024-11-30 21:20:52.387635501 +0100
312 @@ -9,12 +9,12 @@ _comp_cmd_yum__list()
313 # Try to strip in between headings like "Available Packages"
314 # This will obviously only work for English :P
315 _comp_split COMPREPLY "$(yum -d 0 -C list "$1" "$cur*" 2>/dev/null |
316 - command sed -ne '/^Available /d' -e '/^Installed /d' \
317 + command gsed -ne '/^Available /d' -e '/^Installed /d' \
318 -e '/^Updated /d' -e 's/[[:space:]].*//p')"
319 else
320 # Drop first line (e.g. "Updated Packages")
321 _comp_split COMPREPLY "$(yum -d 0 -C list "$1" "$cur*" 2>/dev/null |
322 - command sed -ne 1d -e 's/[[:space:]].*//p')"
323 + command gsed -ne 1d -e 's/[[:space:]].*//p')"
324 fi
325 }
326
327 @@ -25,7 +25,7 @@ _comp_cmd_yum__compgen_repolist()
328 # Drop first ("repo id repo name") and last ("repolist: ...") rows
329 _comp_compgen_split -- "$(
330 yum --noplugins -C repolist "$1" 2>/dev/null |
331 - command sed -ne '/^repo[[:space:]]\{1,\}id/d' -e '/^repolist:/d' \
332 + command gsed -ne '/^repo[[:space:]]\{1,\}id/d' -e '/^repolist:/d' \
333 -e 's/[[:space:]].*//p'
334 )"
335 }
336 @@ -36,7 +36,7 @@ _comp_cmd_yum__compgen_plugins()
337 _comp_expand_glob files '/usr/lib/yum-plugins/*.py{,c,o}' || return
338 _comp_compgen -U files split -- "$(
339 printf '%s\n' "${files[@]}" |
340 - command sed -ne 's|.*/\([^./]*\)\.py[co]\{0,1\}$|\1|p' | sort -u
341 + command gsed -ne 's|.*/\([^./]*\)\.py[co]\{0,1\}$|\1|p' | sort -u
342 )"
343 }
344
345 diff -pruN bash-completion-2.15.0.old/completions/2to3 bash-completion-2.15.0/completions/2to3
346 --- bash-completion-2.15.0.old/completions/2to3 2024-11-24 23:21:02.000000000 +0100
347 +++ bash-completion-2.15.0/completions/2to3 2024-11-30 21:20:51.869485182 +0100
348 @@ -11,7 +11,7 @@ _comp_cmd_2to3()
349 ;;
350 -f | --fix | -x | --nofix)
351 _comp_compgen_split -- "$(
352 - "$1" --list-fixes 2>/dev/null | command sed -e 1d
353 + "$1" --list-fixes 2>/dev/null | command gsed -e 1d
354 )"
355 return
356 ;;
357 diff -pruN bash-completion-2.15.0.old/completions/7z bash-completion-2.15.0/completions/7z
358 --- bash-completion-2.15.0.old/completions/7z 2024-11-24 23:21:02.000000000 +0100
359 +++ bash-completion-2.15.0/completions/7z 2024-11-30 21:20:51.952186173 +0100
360 @@ -102,7 +102,7 @@ _comp_cmd_7z()
361 else
362 if [[ ${words[1]} == d ]]; then
363 _comp_compgen_split -l -- "$(
364 - "$1" l "${words[2]}" -slt 2>/dev/null | command sed -n \
365 + "$1" l "${words[2]}" -slt 2>/dev/null | command gsed -n \
366 '/^Path =/s/^Path = \(.*\)$/\1/p' 2>/dev/null | tail -n+2
367 )"
368 compopt -o filenames
369 diff -pruN bash-completion-2.15.0.old/completions/abook bash-completion-2.15.0/completions/abook
370 --- bash-completion-2.15.0.old/completions/abook 2024-11-24 23:21:02.000000000 +0100
371 +++ bash-completion-2.15.0/completions/abook 2024-11-30 21:20:52.085146523 +0100
372 @@ -23,11 +23,11 @@ _comp_cmd_abook()
373 case $prev in
374 --informat)
375 _comp_compgen_split -- "$("$1" --formats |
376 - command sed -n -e 's/^'$'\t''\([a-z]*\).*/\1/p' -e '/^$/q')"
377 + command gsed -n -e 's/^'$'\t''\([a-z]*\).*/\1/p' -e '/^$/q')"
378 ;;
379 --outformat)
380 _comp_compgen_split -- "$("$1" --formats |
381 - command sed -n -e '/^$/,$s/^'$'\t''\([a-z]*\).*/\1/p')"
382 + command gsed -n -e '/^$/,$s/^'$'\t''\([a-z]*\).*/\1/p')"
383 ;;
384 --infile)
385 _comp_compgen -- -W stdin
386 diff -pruN bash-completion-2.15.0.old/completions/alias bash-completion-2.15.0/completions/alias
387 --- bash-completion-2.15.0.old/completions/alias 2024-11-24 23:21:02.000000000 +0100
388 +++ bash-completion-2.15.0/completions/alias 2024-11-30 21:20:52.261131537 +0100
389 @@ -13,7 +13,7 @@ _comp_cmd_alias()
390 _comp_compgen -- -A alias
391 ;;
392 *=)
393 - COMPREPLY=("$(alias "${cur%=}" 2>/dev/null | command sed \
394 + COMPREPLY=("$(alias "${cur%=}" 2>/dev/null | command gsed \
395 -e 's|^alias '"$cur"'\(.*\)$|\1|')")
396 ;;
397 esac
398 diff -pruN bash-completion-2.15.0.old/completions/appdata-validate bash-completion-2.15.0/completions/appdata-validate
399 --- bash-completion-2.15.0.old/completions/appdata-validate 2024-11-24 23:21:02.000000000 +0100
400 +++ bash-completion-2.15.0/completions/appdata-validate 2024-11-30 21:20:52.186902379 +0100
401 @@ -10,7 +10,7 @@ _comp_cmd_appdata_validate()
402 return
403 ;;
404 --output-format)
405 - _comp_compgen_split -- "$("$1" --help | command sed -ne \
406 + _comp_compgen_split -- "$("$1" --help | command gsed -ne \
407 's/--output-format.*\[\(.*\)\]/\1/' -e 's/|/ /gp')"
408 return
409 ;;
410 diff -pruN bash-completion-2.15.0.old/completions/apt-get bash-completion-2.15.0/completions/apt-get
411 --- bash-completion-2.15.0.old/completions/apt-get 2024-11-24 23:21:02.000000000 +0100
412 +++ bash-completion-2.15.0/completions/apt-get 2024-11-30 21:20:52.152172063 +0100
413 @@ -80,7 +80,7 @@ _comp_cmd_apt_get()
414 # Prefer `apt-cache` in the same dir as command
415 local pathcmd
416 pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
417 - _comp_compgen_split -- "$(apt-cache policy | command sed -ne \
418 + _comp_compgen_split -- "$(apt-cache policy | command gsed -ne \
419 's/^ *release.*[ ,]o=\(Debian\|Ubuntu\),a=\(\w*\).*/\2/p')"
420 return
421 ;;
422 diff -pruN bash-completion-2.15.0.old/completions/aptitude bash-completion-2.15.0/completions/aptitude
423 --- bash-completion-2.15.0.old/completions/aptitude 2024-11-24 23:21:02.000000000 +0100
424 +++ bash-completion-2.15.0/completions/aptitude 2024-11-30 21:20:52.436491286 +0100
425 @@ -53,13 +53,13 @@ _comp_cmd_aptitude()
426 ;;
427 --target-release | --default-release | -${noargopts}t)
428 _comp_compgen_split -l -- "$(apt-cache policy |
429 - command sed -ne 's/.*release.o=Debian,a=\([_[:alnum:]]*\).*/\1/p')"
430 + command gsed -ne 's/.*release.o=Debian,a=\([_[:alnum:]]*\).*/\1/p')"
431 return
432 ;;
433 esac
434
435 if [[ $cur == -* ]]; then
436 - _comp_compgen -R help - <<<"$("$1" --help 2>&1 | command sed -e \
437 + _comp_compgen -R help - <<<"$("$1" --help 2>&1 | command gsed -e \
438 's/--with(out)-recommends/--without-recommends\n--with-recommends/')"
439 ((${#COMPREPLY[@]})) || return 0
440
441 diff -pruN bash-completion-2.15.0.old/completions/arp bash-completion-2.15.0/completions/arp
442 --- bash-completion-2.15.0.old/completions/arp 2024-11-24 23:21:02.000000000 +0100
443 +++ bash-completion-2.15.0/completions/arp 2024-11-30 21:20:52.408579941 +0100
444 @@ -37,7 +37,7 @@ _comp_cmd_arp()
445 _comp_count_args -a "@(--device|--protocol|--file|--hw-type|-${noargopts}[iApfHt])"
446 case $REPLY in
447 1)
448 - local ips=$("$1" -an | command sed -ne \
449 + local ips=$("$1" -an | command gsed -ne \
450 's/.*(\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{3\}\)).*/\1/p')
451 _comp_compgen -- -W '$ips'
452 ;;
453 diff -pruN bash-completion-2.15.0.old/completions/beadm bash-completion-2.15.0/completions/beadm
454 --- bash-completion-2.15.0.old/completions/beadm 2020-01-11 19:58:32.000000000 +0100
455 +++ bash-completion-2.15.0/completions/beadm 2024-11-30 21:20:52.059642915 +0100
456 @@ -138,7 +138,7 @@ _beadm()
457 # entered BE name, so find snapshot for the particuler BE
458 if [[ "${prev}" != "rollback" ]]
459 then
460 - be_and_snapshots=( $(for K in echo "${!be_and_snapshots[@]}"; do echo ${be_and_snapshots[$K]} | grep "^${prev}@" | sed -e 's,.*@,,'; done) )
461 + be_and_snapshots=( $(for K in echo "${!be_and_snapshots[@]}"; do echo ${be_and_snapshots[$K]} | ggrep "^${prev}@" | gsed -e 's,.*@,,'; done) )
462 fi
463 ;;
464 esac
465 @@ -188,7 +188,7 @@ _beadm()
466 local pprev="${COMP_WORDS[COMP_CWORD-2]}"
467 local realcur="${cur##*=}"
468 local zfsprop="${pprev%%@*}"; zfsprop="${zfsprop##*,}"
469 - local zfsvals=( $(zfs get 2>&1 | nawk '$1 == "'${zfsprop}'" && $2 == "YES" { $1=""; $2=""; $3=""; print }' | sed -e 's,|,,g') )
470 + local zfsvals=( $(zfs get 2>&1 | nawk '$1 == "'${zfsprop}'" && $2 == "YES" { $1=""; $2=""; $3=""; print }' | gsed -e 's,|,,g') )
471 compopt -o nospace
472 compopt -o nosort
473 COMPREPLY=( $(compgen -W "${zfsvals[*]}" -- "${realcur}") )
474 @@ -206,7 +206,7 @@ _beadm()
475 # ZFS property values
476 local realcur=${cur##*=}
477 local zfsprop=${prev%%@*}; zfsprop=${zfsprop##*,}
478 - local zfsvals=( $(zfs get 2>&1 | nawk '$1 == "'${zfsprop}'" && $2 == "YES" { $1=""; $2=""; $3=""; print }' | sed -e 's,|,,g') )
479 + local zfsvals=( $(zfs get 2>&1 | nawk '$1 == "'${zfsprop}'" && $2 == "YES" { $1=""; $2=""; $3=""; print }' | gsed -e 's,|,,g') )
480 compopt -o nospace
481 compopt -o nosort
482 COMPREPLY=( $(compgen -W "${zfsvals[*]}" -- "${realcur}") )
483 diff -pruN bash-completion-2.15.0.old/completions/carton bash-completion-2.15.0/completions/carton
484 --- bash-completion-2.15.0.old/completions/carton 2024-11-24 23:21:02.000000000 +0100
485 +++ bash-completion-2.15.0/completions/carton 2024-11-30 21:20:52.374062491 +0100
486 @@ -3,7 +3,7 @@
487 _comp_cmd_carton__commands()
488 {
489 local cmds=$("$1" usage 2>&1 |
490 - command sed -ne '/.*command.* is one of/{n;p;q;}')
491 + command gsed -ne '/.*command.* is one of/{n;p;q;}')
492 _comp_compgen -aF $' \t\n,' -- -W "$cmds"
493 }
494
495 diff -pruN bash-completion-2.15.0.old/completions/ccze bash-completion-2.15.0/completions/ccze
496 --- bash-completion-2.15.0.old/completions/ccze 2024-11-24 23:21:02.000000000 +0100
497 +++ bash-completion-2.15.0/completions/ccze 2024-11-30 21:20:52.278422170 +0100
498 @@ -30,7 +30,7 @@ _comp_cmd_ccze()
499 ;;
500 --plugin | -${noargopts}p)
501 _comp_compgen_split -- "$("$1" --list-plugins | command \
502 - sed -ne 's/^\([a-z0-9]\{1,\}\)[[:space:]]\{1,\}|.*/\1/p')"
503 + gsed -ne 's/^\([a-z0-9]\{1,\}\)[[:space:]]\{1,\}|.*/\1/p')"
504 return
505 ;;
506 esac
507 diff -pruN bash-completion-2.15.0.old/completions/cfrun bash-completion-2.15.0/completions/cfrun
508 --- bash-completion-2.15.0.old/completions/cfrun 2024-11-24 23:21:02.000000000 +0100
509 +++ bash-completion-2.15.0/completions/cfrun 2024-11-30 21:20:52.149837527 +0100
510 @@ -33,7 +33,7 @@ _comp_cmd_cfrun()
511 done
512 [[ ! -f $hostfile ]] && return
513
514 - _comp_compgen_split -- "$(command grep -v -E '(=|^$|^#)' \
515 + _comp_compgen_split -- "$(command ggrep -v -E '(=|^$|^#)' \
516 "$hostfile")"
517 fi
518 ;;
519 diff -pruN bash-completion-2.15.0.old/completions/checksec bash-completion-2.15.0/completions/checksec
520 --- bash-completion-2.15.0.old/completions/checksec 2024-11-24 23:21:02.000000000 +0100
521 +++ bash-completion-2.15.0/completions/checksec 2024-11-30 21:20:52.256344951 +0100
522 @@ -27,11 +27,11 @@ _comp_cmd_checksec()
523 ;;
524 --format)
525 _comp_compgen_split -- "$("$1" --help 2>/dev/null |
526 - command sed -ne 's/[{,}]/ /g;s/^[[:space:]]*--format=//p')"
527 + command gsed -ne 's/[{,}]/ /g;s/^[[:space:]]*--format=//p')"
528 ;;
529 --output)
530 _comp_compgen_split -- "$("$1" --help 2>/dev/null |
531 - command sed -ne 's/[{,}]/ /g;s/^[[:space:]]*--output=//p')"
532 + command gsed -ne 's/[{,}]/ /g;s/^[[:space:]]*--output=//p')"
533 ;;
534 esac
535
536 diff -pruN bash-completion-2.15.0.old/completions/complete bash-completion-2.15.0/completions/complete
537 --- bash-completion-2.15.0.old/completions/complete 2024-11-24 23:21:02.000000000 +0100
538 +++ bash-completion-2.15.0/completions/complete 2024-11-30 21:20:52.297526404 +0100
539 @@ -29,7 +29,7 @@ _comp_cmd_complete()
540 return
541 ;;
542 -*p | -*r)
543 - _comp_compgen_split -l -- "$(complete -p | command sed -e 's|.* ||')"
544 + _comp_compgen_split -l -- "$(complete -p | command gsed -e 's|.* ||')"
545 return
546 ;;
547 esac
548 diff -pruN bash-completion-2.15.0.old/completions/configure bash-completion-2.15.0/completions/configure
549 --- bash-completion-2.15.0.old/completions/configure 2024-11-24 23:21:02.000000000 +0100
550 +++ bash-completion-2.15.0/completions/configure 2024-11-30 21:20:52.242813644 +0100
551 @@ -33,7 +33,7 @@ _comp_cmd_configure()
552 if [[ ${BASH_COMPLETION_CMD_CONFIGURE_HINTS-} ]]; then
553 _comp_compgen_split -- "$("$1" --help 2>&1 |
554 _comp_awk '/^ --[A-Za-z]/ { print $1; \
555 - if ($2 ~ /--[A-Za-z]/) print $2 }' | command sed -e 's/[[,].*//g')"
556 + if ($2 ~ /--[A-Za-z]/) print $2 }' | command gsed -e 's/[[,].*//g')"
557 [[ ${COMPREPLY-} == *=* ]] && compopt -o nospace
558 else
559 _comp_compgen_help
560 diff -pruN bash-completion-2.15.0.old/completions/cpan2dist bash-completion-2.15.0/completions/cpan2dist
561 --- bash-completion-2.15.0.old/completions/cpan2dist 2024-11-24 23:21:02.000000000 +0100
562 +++ bash-completion-2.15.0/completions/cpan2dist 2024-11-30 21:20:52.161475152 +0100
563 @@ -29,7 +29,7 @@ _comp_cmd_cpan2dist()
564 done
565 [[ $packagelist ]] && _comp_split COMPREPLY "$(zgrep "^${cur//-/::}" \
566 "$packagelist" 2>/dev/null | _comp_awk '{print $1}' |
567 - command sed -e 's/::/-/g')"
568 + command gsed -e 's/::/-/g')"
569 fi
570 } &&
571 complete -F _comp_cmd_cpan2dist -o default cpan2dist
572 diff -pruN bash-completion-2.15.0.old/completions/curl bash-completion-2.15.0/completions/curl
573 --- bash-completion-2.15.0.old/completions/curl 2024-11-24 23:21:02.000000000 +0100
574 +++ bash-completion-2.15.0/completions/curl 2024-11-30 21:20:52.277302619 +0100
575 @@ -80,7 +80,7 @@ _comp_cmd_curl()
576 --engine)
577 local engines=$(
578 "$1" --engine list 2>/dev/null |
579 - command grep "^[[:space:]]"
580 + command ggrep "^[[:space:]]"
581 )
582 _comp_compgen -- -W '$engines list'
583 return
584 @@ -129,7 +129,7 @@ _comp_cmd_curl()
585 return
586 ;;
587 --proto-default)
588 - _comp_compgen_split "$("$1" --version 2>/dev/null | command sed -e '/Protocols/!d' -e 's/Protocols://')"
589 + _comp_compgen_split "$("$1" --version 2>/dev/null | command gsed -e '/Protocols/!d' -e 's/Protocols://')"
590 ;;
591 --pubkey)
592 _comp_compgen -x ssh identityfile pub
593 diff -pruN bash-completion-2.15.0.old/completions/cvs bash-completion-2.15.0/completions/cvs
594 --- bash-completion-2.15.0.old/completions/cvs 2024-11-24 23:21:02.000000000 +0100
595 +++ bash-completion-2.15.0/completions/cvs 2024-11-30 21:20:51.919769798 +0100
596 @@ -262,7 +262,7 @@ _comp_cmd_cvs()
597 # far, but other changes (something other than
598 # changed/removed/new) may be missing.
599 _comp_compgen -a split -- "$(cvs -q diff --brief 2>&1 |
600 - command sed -ne '
601 + command gsed -ne '
602 # changed
603 s/^Files [^ ]* and \([^ ]*\) differ$/\1/p
604 # new/removed
605 diff -pruN bash-completion-2.15.0.old/completions/dict bash-completion-2.15.0/completions/dict
606 --- bash-completion-2.15.0.old/completions/dict 2024-11-24 23:21:02.000000000 +0100
607 +++ bash-completion-2.15.0/completions/dict 2024-11-30 21:20:52.048065904 +0100
608 @@ -4,7 +4,7 @@ _comp_cmd_dict__compgen_dictdata()
609 {
610 # shellcheck disable=SC2086
611 _comp_compgen_split -- "$(
612 - "$@" 2>/dev/null | command sed -ne \
613 + "$@" 2>/dev/null | command gsed -ne \
614 's/^[[:blank:]]\{1,\}\([^[:blank:]]*\).*$/\1/p'
615 )"
616 }
617 @@ -56,11 +56,11 @@ _comp_cmd_dict()
618 local dictfile=/usr/share/dict/words
619 if [[ -r $dictfile ]]; then
620 # Dictfile may be too large for practical compgen -W usage, so narrow
621 - # it down with grep if $cur looks like something that's safe to embed
622 + # it down with ggrep if $cur looks like something that's safe to embed
623 # in a pattern instead.
624 if [[ $cur == +([-A-Za-z0-9/.]) ]]; then
625 _comp_compgen_split -- "$(
626 - command grep "^${cur//./\\.}" "$dictfile"
627 + command ggrep "^${cur//./\\.}" "$dictfile"
628 )"
629 else
630 _comp_compgen_split -- "$(cat "$dictfile")"
631 diff -pruN bash-completion-2.15.0.old/completions/dladm bash-completion-2.15.0/completions/dladm
632 --- bash-completion-2.15.0.old/completions/dladm 2020-01-11 19:58:32.000000000 +0100
633 +++ bash-completion-2.15.0/completions/dladm 2024-11-30 21:20:52.413275302 +0100
634 @@ -14,7 +14,7 @@ _dladm()
635 COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
636 elif [[ ${prev} =~ "-z" ]]; then
637 # Some illumos OS distributions have zone-aware dladm. Treat -z as a zone name option
638 - local zones="$(zoneadm list -c | grep -v '^global$')"
639 + local zones="$(zoneadm list -c | ggrep -v '^global$')"
640 COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
641 elif [[ ${prev} =~ 'delete-vnic' ]]; then
642 # Redirect stderr to /dev/null not to polute console, e.g.:
643 diff -pruN bash-completion-2.15.0.old/completions/dmypy bash-completion-2.15.0/completions/dmypy
644 --- bash-completion-2.15.0.old/completions/dmypy 2024-11-24 23:21:02.000000000 +0100
645 +++ bash-completion-2.15.0/completions/dmypy 2024-11-30 21:20:52.257526845 +0100
646 @@ -38,8 +38,8 @@ _comp_cmd_dmypy()
647
648 if [[ ! $has_cmd ]]; then
649 local cmds=$("$1" --help 2>&1 |
650 - command sed -ne '/positional arguments/{p;n;p;q;}' |
651 - command sed -ne 's/{\(.*\)}/\1/p')
652 + command gsed -ne '/positional arguments/{p;n;p;q;}' |
653 + command gsed -ne 's/{\(.*\)}/\1/p')
654 _comp_compgen -F , -- -W '$cmds'
655 return
656 fi
657 diff -pruN bash-completion-2.15.0.old/completions/dnssec-keygen bash-completion-2.15.0/completions/dnssec-keygen
658 --- bash-completion-2.15.0.old/completions/dnssec-keygen 2024-11-24 23:21:02.000000000 +0100
659 +++ bash-completion-2.15.0/completions/dnssec-keygen 2024-11-30 21:20:52.417867713 +0100
660 @@ -3,9 +3,9 @@
661 _comp_cmd_dnssec_keygen__optarg()
662 {
663 local args=$("$1" -h 2>&1 |
664 - command sed -e 's/|/ /g' -e 's/(.*//' \
665 + command gsed -e 's/|/ /g' -e 's/(.*//' \
666 -ne '/^[[:space:]]*'"$2"'/,/^[[:space:]]*[(-]/p' |
667 - command sed -e 's/^[[:space:]]*'"$2"'.*://' -e '/^[[:space:]]*-/d')
668 + command gsed -e 's/^[[:space:]]*'"$2"'.*://' -e '/^[[:space:]]*-/d')
669 _comp_compgen -a -- -W '$args'
670 }
671
672 diff -pruN bash-completion-2.15.0.old/completions/dot bash-completion-2.15.0/completions/dot
673 --- bash-completion-2.15.0.old/completions/dot 2024-11-24 23:21:02.000000000 +0100
674 +++ bash-completion-2.15.0/completions/dot 2024-11-30 21:20:52.415609922 +0100
675 @@ -14,14 +14,14 @@ _comp_cmd_dot()
676 -T*)
677 # generate langs
678 _comp_compgen -c "${cur#-T}" split -P "-T" -- "$(
679 - "$1" -TNON_EXISTENT 2>&1 | command sed -ne 's/.*one of://p'
680 + "$1" -TNON_EXISTENT 2>&1 | command gsed -ne 's/.*one of://p'
681 )"
682 return
683 ;;
684 -K*)
685 # generate layouts
686 _comp_compgen -c "${cur#-K}" split -P "-K" -- "$(
687 - "$1" -KNON_EXISTENT 2>&1 | command sed -ne 's/.*one of://p'
688 + "$1" -KNON_EXISTENT 2>&1 | command gsed -ne 's/.*one of://p'
689 )"
690 return
691 ;;
692 diff -pruN bash-completion-2.15.0.old/completions/ebtables bash-completion-2.15.0/completions/ebtables
693 --- bash-completion-2.15.0.old/completions/ebtables 2024-11-24 23:21:02.000000000 +0100
694 +++ bash-completion-2.15.0/completions/ebtables 2024-11-30 21:20:51.932538359 +0100
695 @@ -18,7 +18,7 @@ _comp_cmd_ebtables()
696 -${noargopts}[AIDPFXLZ])
697 _comp_compgen_split -- "$(
698 "$1" ${table:+-t "$table"} -L 2>/dev/null |
699 - command sed -ne "$chain"
700 + command gsed -ne "$chain"
701 )"
702 ;;
703 -${noargopts}t)
704 @@ -28,17 +28,17 @@ _comp_cmd_ebtables()
705 if [[ $table == "filter" || ! $table ]]; then
706 _comp_compgen -- -W '$targets'
707 _comp_compgen -a split -- "$("$1" ${table:+-t "$table"} -L \
708 - 2>/dev/null | command sed -n -e \
709 + 2>/dev/null | command gsed -n -e \
710 "s/INPUT\|OUTPUT\|FORWARD//" -e "$chain")"
711 elif [[ $table == "nat" ]]; then
712 _comp_compgen -- -W '$targets'
713 _comp_compgen -a split -- "$("$1" -t "$table" -L 2>/dev/null |
714 - command sed -n -e "s/OUTPUT|PREROUTING|POSTROUTING//" \
715 + command gsed -n -e "s/OUTPUT|PREROUTING|POSTROUTING//" \
716 -e "$chain")"
717 elif [[ $table == "broute" ]]; then
718 _comp_compgen -- -W 'ACCEPT DROP'
719 _comp_compgen -a split -- "$("$1" -t "$table" -L 2>/dev/null |
720 - command sed -n -e "s/BROUTING//" -e "$chain")"
721 + command gsed -n -e "s/BROUTING//" -e "$chain")"
722 fi
723 ;;
724 *)
725 diff -pruN bash-completion-2.15.0.old/completions/fbgs bash-completion-2.15.0/completions/fbgs
726 --- bash-completion-2.15.0.old/completions/fbgs 2024-11-24 23:21:02.000000000 +0100
727 +++ bash-completion-2.15.0/completions/fbgs 2024-11-30 21:20:52.275019558 +0100
728 @@ -11,7 +11,7 @@ _comp_cmd_fbgs()
729 return
730 ;;
731 -m | --mode)
732 - _comp_compgen_split -- "$(command sed \
733 + _comp_compgen_split -- "$(command gsed \
734 -n '/^mode/{s/^mode \{1,\}"\([^"]\{1,\}\)"/\1/g;p}' \
735 /etc/fb.modes 2>/dev/null)"
736 return
737 diff -pruN bash-completion-2.15.0.old/completions/fbi bash-completion-2.15.0/completions/fbi
738 --- bash-completion-2.15.0.old/completions/fbi 2024-11-24 23:21:02.000000000 +0100
739 +++ bash-completion-2.15.0/completions/fbi 2024-11-30 21:20:52.037704169 +0100
740 @@ -19,7 +19,7 @@ _comp_cmd_fbi()
741 return
742 ;;
743 -m | --mode)
744 - _comp_compgen_split -- "$(command sed \
745 + _comp_compgen_split -- "$(command gsed \
746 -n '/^mode/{s/^mode \{1,\}"\([^"]\{1,\}\)"/\1/g;p}' \
747 /etc/fb.modes 2>/dev/null)"
748 return
749 diff -pruN bash-completion-2.15.0.old/completions/fio bash-completion-2.15.0/completions/fio
750 --- bash-completion-2.15.0.old/completions/fio 2024-11-24 23:21:02.000000000 +0100
751 +++ bash-completion-2.15.0/completions/fio 2024-11-30 21:20:51.965468046 +0100
752 @@ -2,7 +2,7 @@
753
754 _comp_cmd_fio__compgen_engines()
755 {
756 - _comp_compgen_split -F $'\t\n' -- "$("$1" --enghelp 2>/dev/null | command sed -ne '/^[[:space:]]/p')"
757 + _comp_compgen_split -F $'\t\n' -- "$("$1" --enghelp 2>/dev/null | command gsed -ne '/^[[:space:]]/p')"
758 }
759
760 _comp_cmd_fio()
761 diff -pruN bash-completion-2.15.0.old/completions/fprintd-enroll bash-completion-2.15.0/completions/fprintd-enroll
762 --- bash-completion-2.15.0.old/completions/fprintd-enroll 2024-11-24 23:21:02.000000000 +0100
763 +++ bash-completion-2.15.0/completions/fprintd-enroll 2024-11-30 21:20:52.363996370 +0100
764 @@ -15,7 +15,7 @@ _comp_cmd_fprintd_enroll()
765 # Only -enroll may output a message with valid options in it
766 _comp_compgen_split -- "$(
767 "${1/-verify/-enroll}" --finger no-such-finger 2>&1 |
768 - command sed \
769 + command gsed \
770 -e s/,//g -ne 's/^.*Name must be one of \(.*\)/\1/p'
771 )"
772 return
773 diff -pruN bash-completion-2.15.0.old/completions/function bash-completion-2.15.0/completions/function
774 --- bash-completion-2.15.0.old/completions/function 2024-11-24 23:21:02.000000000 +0100
775 +++ bash-completion-2.15.0/completions/function 2024-11-30 21:20:52.225708107 +0100
776 @@ -8,7 +8,7 @@ _comp_cmd_function()
777 if ((cword == 1)); then
778 _comp_compgen -- -A function
779 else
780 - local funcdef=$(type -- "${words[1]}" 2>/dev/null | command sed -e 1,2d)
781 + local funcdef=$(type -- "${words[1]}" 2>/dev/null | command gsed -e 1,2d)
782 COMPREPLY=("()${funcdef:+ $funcdef}")
783 fi
784 } &&
785 diff -pruN bash-completion-2.15.0.old/completions/gcc bash-completion-2.15.0/completions/gcc
786 --- bash-completion-2.15.0.old/completions/gcc 2024-11-24 23:21:02.000000000 +0100
787 +++ bash-completion-2.15.0/completions/gcc 2024-11-30 21:20:51.953413173 +0100
788 @@ -12,7 +12,7 @@ _comp_cmd_gcc()
789 local cc=$("$1" -print-prog-name=cc1 2>/dev/null)
790 [[ $cc ]] || return
791 _comp_compgen_split -- "$("$cc" --help 2>/dev/null | tr '\t' ' ' |
792 - command sed -e '/^ *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')"
793 + command gsed -e '/^ *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')"
794 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
795 else
796 _comp_compgen_filedir
797 @@ -62,7 +62,7 @@ _comp_cmd_gcc()
798 local REPLY
799 _comp_realcommand "$1"
800 if [[ $REPLY == *$2* ]] ||
801 - "$1" --version 2>/dev/null | command grep -q GCC; then
802 + "$1" --version 2>/dev/null | command ggrep -q GCC; then
803 complete -F _comp_cmd_gcc "$1"
804 else
805 complete -F _comp_complete_minimal "$1"
806 diff -pruN bash-completion-2.15.0.old/completions/gdb bash-completion-2.15.0/completions/gdb
807 --- bash-completion-2.15.0.old/completions/gdb 2024-11-24 23:21:02.000000000 +0100
808 +++ bash-completion-2.15.0/completions/gdb 2024-11-30 21:20:52.235821995 +0100
809 @@ -31,7 +31,7 @@ _comp_cmd_gdb()
810 IFS=$' \t\n'
811 find ${path_array[@]+"${path_array[@]}"} . -name . -o \
812 -type d -prune -o -perm -u+x -print 2>/dev/null |
813 - command sed 's|^.*/||' | sort -u
814 + command gsed 's|^.*/||' | sort -u
815 )"
816 fi
817 elif ((cword == 2)); then
818 diff -pruN bash-completion-2.15.0.old/completions/gnokii bash-completion-2.15.0/completions/gnokii
819 --- bash-completion-2.15.0.old/completions/gnokii 2024-11-24 23:21:02.000000000 +0100
820 +++ bash-completion-2.15.0/completions/gnokii 2024-11-30 21:20:52.008811388 +0100
821 @@ -24,7 +24,7 @@ _comp_cmd_gnokii()
822 [[ -f $config_file ]] && break
823 done
824 [[ ! -f $config_file ]] && return
825 - _comp_compgen_split -- "$(command sed -n \
826 + _comp_compgen_split -- "$(command gsed -n \
827 's/^\[phone_\(.*\)\]/\1/p' "$config_file")"
828 return
829 ;;
830 @@ -221,7 +221,7 @@ _comp_cmd_gnokii()
831 # these 2 below are allowed in combination with others
832 local main_cmd
833 _comp_split -l main_cmd "$(printf '%s\n' "${all_cmd[@]}" |
834 - command sed -e '/--config/d;/--phone/d;s/[][\(){}|^$*+?.]/\\&/g')"
835 + command gsed -e '/--config/d;/--phone/d;s/[][\(){}|^$*+?.]/\\&/g')"
836 # don't provide main command completions if one is
837 # already on the command line
838 local IFS='|'
839 diff -pruN bash-completion-2.15.0.old/completions/gpg bash-completion-2.15.0/completions/gpg
840 --- bash-completion-2.15.0.old/completions/gpg 2024-11-24 23:21:02.000000000 +0100
841 +++ bash-completion-2.15.0/completions/gpg 2024-11-30 21:20:52.153371070 +0100
842 @@ -20,7 +20,7 @@ _comp_cmd_gpg()
843 --nrsign-key | --nrlsign-key | --try-secret-key | -${noargopts}k)
844 # return list of public keys
845 _comp_compgen_split -- "$("$1" --list-keys 2>/dev/null |
846 - command sed -ne \
847 + command gsed -ne \
848 's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
849 's@^.*\(<\([^>]*\)>\).*$@\2@p')"
850 return
851 @@ -29,14 +29,14 @@ _comp_cmd_gpg()
852 --export-secret-subkeys | -${noargopts}K)
853 # return list of secret keys
854 _comp_compgen_split -- "$("$1" --list-secret-keys 2>/dev/null |
855 - command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
856 + command gsed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
857 return
858 ;;
859 --recipient | -${noargopts}r)
860 _comp_compgen_split -- "$("$1" --list-keys 2>/dev/null |
861 - command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
862 + command gsed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
863 if [[ -e ~/.gnupg/gpg.conf ]]; then
864 - _comp_compgen -a split -- "$(command sed -ne \
865 + _comp_compgen -a split -- "$(command gsed -ne \
866 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
867 ~/.gnupg/gpg.conf)"
868 fi
869 diff -pruN bash-completion-2.15.0.old/completions/gpg2 bash-completion-2.15.0/completions/gpg2
870 --- bash-completion-2.15.0.old/completions/gpg2 2024-11-24 23:21:02.000000000 +0100
871 +++ bash-completion-2.15.0/completions/gpg2 2024-11-30 21:20:52.356084663 +0100
872 @@ -21,16 +21,16 @@ _comp_cmd_gpg2()
873 --locate-keys | --refresh-keys)
874 # return list of public keys
875 _comp_compgen_split -- "$("$1" --list-keys 2>/dev/null |
876 - command sed -ne \
877 + command gsed -ne \
878 's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
879 's@^.*\(<\([^>]*\)>\).*$@\2@p')"
880 return
881 ;;
882 --recipient | -${noargopts}r)
883 _comp_compgen_split -- "$("$1" --list-keys 2>/dev/null |
884 - command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
885 + command gsed -ne 's@^.*<\([^>]*\)>.*$@\1@p')"
886 if [[ -e ~/.gnupg/gpg.conf ]]; then
887 - _comp_compgen -a split -- "$(command sed -ne \
888 + _comp_compgen -a split -- "$(command gsed -ne \
889 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
890 ~/.gnupg/gpg.conf)"
891 fi
892 diff -pruN bash-completion-2.15.0.old/completions/gssdp-discover bash-completion-2.15.0/completions/gssdp-discover
893 --- bash-completion-2.15.0.old/completions/gssdp-discover 2024-11-24 23:21:02.000000000 +0100
894 +++ bash-completion-2.15.0/completions/gssdp-discover 2024-11-30 21:20:52.316941529 +0100
895 @@ -16,7 +16,7 @@ _comp_cmd_gssdp_discover()
896 --message-type | -m)
897 [[ $1 == *gssdp-discover ]] || return
898 local types=$("$1" --help 2>&1 |
899 - command sed -ne 's/^.*--message-type=.*(\([^)]*\))$/\1/p')
900 + command gsed -ne 's/^.*--message-type=.*(\([^)]*\))$/\1/p')
901 _comp_compgen -F $' \t\n,' -- -W "$types"
902 return
903 ;;
904 diff -pruN bash-completion-2.15.0.old/completions/iconv bash-completion-2.15.0/completions/iconv
905 --- bash-completion-2.15.0.old/completions/iconv 2024-11-24 23:21:02.000000000 +0100
906 +++ bash-completion-2.15.0/completions/iconv 2024-11-30 21:20:52.001762423 +0100
907 @@ -15,7 +15,7 @@ _iconv_charsets()
908 _comp_cmd_iconv__compgen_charsets()
909 {
910 _comp_compgen_split -X ... -- "$("$1" -l |
911 - command sed -e 's@/*$@@' -e 's/[,()]//g')"
912 + command gsed -e 's@/*$@@' -e 's/[,()]//g')"
913 }
914
915 _comp_cmd_iconv()
916 diff -pruN bash-completion-2.15.0.old/completions/ifstat bash-completion-2.15.0/completions/ifstat
917 --- bash-completion-2.15.0.old/completions/ifstat 2024-11-24 23:21:02.000000000 +0100
918 +++ bash-completion-2.15.0/completions/ifstat 2024-11-30 21:20:51.905970164 +0100
919 @@ -22,8 +22,8 @@ _comp_cmd_ifstat()
920 if ! {
921 "$1" --help 2>&1 || :
922 } |
923 - command grep -q -- '-d.*--scan'; then
924 - _comp_compgen_split -- "$("$1" -v | command sed -e 's/[,.]//g' \
925 + command ggrep -q -- '-d.*--scan'; then
926 + _comp_compgen_split -- "$("$1" -v | command gsed -e 's/[,.]//g' \
927 -ne 's/^.*drivers://p')"
928 fi
929 return
930 @@ -34,7 +34,7 @@ _comp_cmd_ifstat()
931 if ! {
932 "$1" --help 2>&1 || :
933 } |
934 - command grep -q -- '-s.*--noupdate'; then
935 + command ggrep -q -- '-s.*--noupdate'; then
936 _comp_compgen_known_hosts -- "$cur"
937 return
938 fi
939 @@ -45,7 +45,7 @@ _comp_cmd_ifstat()
940 ! {
941 "$1" --help 2>&1 || :
942 } |
943 - command grep -q -- '-t.*--interval' || return
944 + command ggrep -q -- '-t.*--interval' || return
945 ;;
946 --extended | -${noargopts}x)
947 # iproute2: parse xstat types
948 diff -pruN bash-completion-2.15.0.old/completions/inotifywait bash-completion-2.15.0/completions/inotifywait
949 --- bash-completion-2.15.0.old/completions/inotifywait 2024-11-24 23:21:02.000000000 +0100
950 +++ bash-completion-2.15.0/completions/inotifywait 2024-11-30 21:20:51.853290292 +0100
951 @@ -6,7 +6,7 @@ _comp_cmd_inotifywait__events()
952 # tab. Word following the tab is event name, others are line
953 # wrapped explanations.
954 _comp_compgen -a split -- "$("$1" --help 2>/dev/null |
955 - command sed -e '/^Events:/,/^[^'$'\t'']/!d' \
956 + command gsed -e '/^Events:/,/^[^'$'\t'']/!d' \
957 -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p')"
958 }
959
960 diff -pruN bash-completion-2.15.0.old/completions/invoke-rc.d bash-completion-2.15.0/completions/invoke-rc.d
961 --- bash-completion-2.15.0.old/completions/invoke-rc.d 2024-11-24 23:21:02.000000000 +0100
962 +++ bash-completion-2.15.0/completions/invoke-rc.d 2024-11-30 21:20:52.352742689 +0100
963 @@ -19,13 +19,13 @@ _comp_cmd_invoke_rc_d()
964 # generate valid_options
965 _comp_compgen_split -- "$(
966 tr " " "\n" <<<"${words[*]} ${options[*]}" |
967 - command sed -ne "/$(command sed 's/ /\\|/g' <<<"${options[*]}")/p" |
968 + command gsed -ne "/$(command gsed 's/ /\\|/g' <<<"${options[*]}")/p" |
969 sort | uniq -u
970 )"
971 _comp_expand_glob services '"$sysvdir"/!(README*|*.sh|$_comp_backup_glob)' &&
972 _comp_compgen -a -- -W '"${services[@]#"$sysvdir"/}"'
973 elif [[ -x $sysvdir/$prev ]]; then
974 - _comp_compgen_split -- "$(command sed -e 'y/|/ /' \
975 + _comp_compgen_split -- "$(command gsed -e 'y/|/ /' \
976 -ne 's/^.*Usage:[ ]*[^ ]*[ ]*{*\([^}"]*\).*$/\1/p' \
977 "$sysvdir/$prev")"
978 else
979 diff -pruN bash-completion-2.15.0.old/completions/ip bash-completion-2.15.0/completions/ip
980 --- bash-completion-2.15.0.old/completions/ip 2024-11-24 23:21:02.000000000 +0100
981 +++ bash-completion-2.15.0/completions/ip 2024-11-30 21:20:52.439036257 +0100
982 @@ -12,7 +12,7 @@ _comp_cmd_ip__netns()
983 _comp_split -l unquoted "$(
984 {
985 ${1-ip} -c=never netns list 2>/dev/null || ${1-ip} netns list
986 - } | command sed -e 's/ (.*//'
987 + } | command gsed -e 's/ (.*//'
988 )"
989 # namespace names can have spaces, so we quote all of them if needed
990 local ns quoted=()
991 @@ -29,7 +29,7 @@ _comp_cmd_ip__link_types()
992 _comp_compgen_split -- "$(
993 {
994 ${1-ip} -c=never link help || ${1-ip} link help
995 - } 2>&1 | command sed -e \
996 + } 2>&1 | command gsed -e \
997 '/TYPE := /,/}/!d' -e \
998 's/.*{//' -e \
999 's/}.*//' -e \
1000 @@ -42,7 +42,7 @@ _comp_cmd_ip__neigh_states()
1001 _comp_compgen_split -- "$(
1002 {
1003 ${1-ip} -c=never neigh help || ${1-ip} neigh help
1004 - } 2>&1 | command sed -e \
1005 + } 2>&1 | command gsed -e \
1006 '/STATE := /,/}/!d' -e \
1007 's/.*{//' -e \
1008 's/}.*//' -e \
1009 @@ -93,7 +93,7 @@ _comp_cmd_ip()
1010 ((cword == 1)) && printf '%s\n' -force
1011 {
1012 "$1" -c=never help || "$1" help
1013 - } 2>&1 | command sed -e \
1014 + } 2>&1 | command gsed -e \
1015 's/[{|}=]/\n/g' -e \
1016 's/\[\([^]]\{1,\}\)\]/\1/g'
1017 )"
1018 @@ -102,7 +102,7 @@ _comp_cmd_ip()
1019 _comp_compgen_split -- "help $(
1020 {
1021 "$1" -c=never help || "$1" help
1022 - } 2>&1 | command sed -e \
1023 + } 2>&1 | command gsed -e \
1024 '/OBJECT := /,/}/!d' -e \
1025 's/.*{//' -e \
1026 's/}.*//' -e \
1027 @@ -304,7 +304,7 @@ _comp_cmd_ip()
1028 _comp_compgen_split -- "$(
1029 {
1030 "$1" -c=never r 2>/dev/null || "$1" r
1031 - } | command sed -ne \
1032 + } | command gsed -ne \
1033 's/.*via \([0-9.]*\).*/\1/p'
1034 )"
1035 elif [[ $prev == "$subcmd" ]]; then
1036 @@ -375,7 +375,7 @@ _comp_cmd_ip()
1037 _comp_compgen -- -W "$(
1038 # stats command was added after color, should always have it
1039 "$1" -c=never stats help 2>&1 |
1040 - command sed -e \
1041 + command gsed -e \
1042 '/^GROUP := /,/}/!d' -e \
1043 's/^GROUP := //g' -e \
1044 '/:=/d' -e \
1045 @@ -464,7 +464,7 @@ _comp_cmd_ip()
1046 _comp_compgen_split -- "$(
1047 {
1048 ip -c=never ntable show 2>/dev/null || ip ntable show
1049 - } | command sed -ne 's/^inet6\{0,1\} //p'
1050 + } | command gsed -ne 's/^inet6\{0,1\} //p'
1051 )"
1052 ;;
1053 *)
1054 @@ -533,7 +533,7 @@ _comp_cmd_ip()
1055 _comp_compgen_split -- "help all $(
1056 {
1057 "$1" -c=never monitor help || "$1" monitor help
1058 - } 2>&1 | command sed -e \
1059 + } 2>&1 | command gsed -e \
1060 '/OBJECTS := /,/[^|]$/!d' -e \
1061 's/OBJECTS := *//' -e \
1062 's/|//g'
1063 diff -pruN bash-completion-2.15.0.old/completions/iperf bash-completion-2.15.0/completions/iperf
1064 --- bash-completion-2.15.0.old/completions/iperf 2024-11-24 23:21:02.000000000 +0100
1065 +++ bash-completion-2.15.0/completions/iperf 2024-11-30 21:20:52.311319446 +0100
1066 @@ -20,8 +20,8 @@ _comp_cmd_iperf()
1067 --format | -${noargopts}f)
1068 local formats=$(
1069 "$1" --help 2>&1 |
1070 - command sed -ne 's/^.*--format .*\[\([a-zA-Z]\{1,\}\)\].*/\1/p' |
1071 - command sed -e 's/./& /g'
1072 + command gsed -ne 's/^.*--format .*\[\([a-zA-Z]\{1,\}\)\].*/\1/p' |
1073 + command gsed -e 's/./& /g'
1074 )
1075 _comp_compgen -- -W '$formats'
1076 return
1077 @@ -77,10 +77,10 @@ _comp_cmd_iperf()
1078 for i in "${words[@]}"; do
1079 case $i in
1080 -s | --server)
1081 - filter=(command sed -e '/^Client.specific/,/^\(Server.specific.*\)\{0,1\}$/d')
1082 + filter=(command gsed -e '/^Client.specific/,/^\(Server.specific.*\)\{0,1\}$/d')
1083 ;;
1084 -c | --client)
1085 - filter=(command sed -e '/^Server.specific/,/^\(Client.specific.*\)\{0,1\}$/d')
1086 + filter=(command gsed -e '/^Server.specific/,/^\(Client.specific.*\)\{0,1\}$/d')
1087 ;;
1088 esac
1089 done
1090 diff -pruN bash-completion-2.15.0.old/completions/ipmitool bash-completion-2.15.0/completions/ipmitool
1091 --- bash-completion-2.15.0.old/completions/ipmitool 2024-11-24 23:21:02.000000000 +0100
1092 +++ bash-completion-2.15.0/completions/ipmitool 2024-11-30 21:20:51.911601844 +0100
1093 @@ -3,7 +3,7 @@
1094 _comp_cmd_ipmitool__singleline_help()
1095 {
1096 _comp_compgen_split -- "$("$1" "$2" 2>&1 |
1097 - command sed -ne 's/[,\r]//g' -e 's/^.*[Cc]ommands://p')"
1098 + command gsed -ne 's/[,\r]//g' -e 's/^.*[Cc]ommands://p')"
1099 }
1100
1101 _comp_cmd_ipmitool()
1102 @@ -23,7 +23,7 @@ _comp_cmd_ipmitool()
1103 ;;
1104 -*I)
1105 _comp_compgen_split -- "$("$1" -h 2>&1 |
1106 - command sed -e '/^Interfaces:/,/^[[:space:]]*$/!d' \
1107 + command gsed -e '/^Interfaces:/,/^[[:space:]]*$/!d' \
1108 -ne 's/^[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*/\1/p')"
1109 return
1110 ;;
1111 diff -pruN bash-completion-2.15.0.old/completions/iptables bash-completion-2.15.0/completions/iptables
1112 --- bash-completion-2.15.0.old/completions/iptables 2024-11-24 23:21:02.000000000 +0100
1113 +++ bash-completion-2.15.0/completions/iptables 2024-11-30 21:20:51.915594946 +0100
1114 @@ -16,7 +16,7 @@ _comp_cmd_iptables()
1115 -*[AIDRPFXLZ])
1116 _comp_compgen_split -- "$(
1117 "$1" ${table:+-t "$table"} -nL 2>/dev/null |
1118 - command sed -ne 's/^Chain \([^ ]\{1,\}\).*$/\1/p'
1119 + command gsed -ne 's/^Chain \([^ ]\{1,\}\).*$/\1/p'
1120 )"
1121 ;;
1122 -*t)
1123 @@ -26,24 +26,24 @@ _comp_cmd_iptables()
1124 if [[ $table == "filter" || ! $table ]]; then
1125 _comp_compgen -- -W '$targets'
1126 _comp_compgen -a split -- "$("$1" ${table:+-t "$table"} -nL \
1127 - 2>/dev/null | command sed -ne "$chain" \
1128 + 2>/dev/null | command gsed -ne "$chain" \
1129 -e 's/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//')"
1130 elif [[ $table == "nat" ]]; then
1131 _comp_compgen -- -W '$targets MIRROR SNAT DNAT MASQUERADE'
1132 _comp_compgen -a split -- "$("$1" -t "$table" -nL 2>/dev/null |
1133 - command sed -ne "$chain" \
1134 + command gsed -ne "$chain" \
1135 -e 's/OUTPUT|PREROUTING|POSTROUTING//')"
1136 elif [[ $table == "mangle" ]]; then
1137 _comp_compgen -- -W '$targets MARK TOS'
1138 _comp_compgen -a split -- "$("$1" -t "$table" -nL 2>/dev/null |
1139 - command sed -ne "$chain" \
1140 + command gsed -ne "$chain" \
1141 -e 's/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//')"
1142 fi
1143 ;;
1144 *)
1145 if [[ $cur == -* ]]; then
1146 _comp_compgen_help - <<<"$("$1" --help 2>&1 |
1147 - command sed -e "s/^\[\!\]//")"
1148 + command gsed -e "s/^\[\!\]//")"
1149 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
1150 fi
1151 ;;
1152 diff -pruN bash-completion-2.15.0.old/completions/ipv6calc bash-completion-2.15.0/completions/ipv6calc
1153 --- bash-completion-2.15.0.old/completions/ipv6calc 2024-11-24 23:21:02.000000000 +0100
1154 +++ bash-completion-2.15.0/completions/ipv6calc 2024-11-30 21:20:52.426028249 +0100
1155 @@ -12,9 +12,9 @@ _comp_cmd_ipv6calc()
1156 return
1157 ;;
1158 --in | --out | --action | -${noargopts}[IOA])
1159 - # With ipv6calc < 0.73.0, -m does nothing here, so use sed instead.
1160 + # With ipv6calc < 0.73.0, -m does nothing here, so use gsed instead.
1161 _comp_compgen_split -- "$("$1" "$prev" -h 2>&1 |
1162 - command sed -ne 's/^[[:space:]]\{1,\}\([^[:space:]:]\{1,\}\)[[:space:]]*:.*/\1/p')"
1163 + command gsed -ne 's/^[[:space:]]\{1,\}\([^[:space:]:]\{1,\}\)[[:space:]]*:.*/\1/p')"
1164 return
1165 ;;
1166 --db-geoip | --db-ip2location-ipv4 | --db-ip2location-ipv6)
1167 @@ -30,7 +30,7 @@ _comp_cmd_ipv6calc()
1168
1169 if [[ $cur == -* ]]; then
1170 _comp_compgen_help - <<<"$("$1" -h 2>&1 |
1171 - command sed -e "s/[][]//g")"
1172 + command gsed -e "s/[][]//g")"
1173 fi
1174
1175 } &&
1176 diff -pruN bash-completion-2.15.0.old/completions/isql bash-completion-2.15.0/completions/isql
1177 --- bash-completion-2.15.0.old/completions/isql 2024-11-24 23:21:02.000000000 +0100
1178 +++ bash-completion-2.15.0/completions/isql 2024-11-30 21:20:51.916956748 +0100
1179 @@ -8,7 +8,7 @@ _comp_cmd_isql()
1180
1181 [[ -f ${ODBCINI-} ]] &&
1182 _comp_compgen_split -l -- "$(
1183 - command sed -n 's/\]//g;s/^\[//gp' "$ODBCINI"
1184 + command gsed -n 's/\]//g;s/^\[//gp' "$ODBCINI"
1185 )"
1186 } &&
1187 complete -F _comp_cmd_isql isql
1188 diff -pruN bash-completion-2.15.0.old/completions/java bash-completion-2.15.0/completions/java
1189 --- bash-completion-2.15.0.old/completions/java 2024-11-24 23:21:02.000000000 +0100
1190 +++ bash-completion-2.15.0/completions/java 2024-11-30 21:20:52.191736366 +0100
1191 @@ -70,7 +70,7 @@ _comp_cmd_java__classes()
1192 if [[ $i == *.@(jar|zip) && -r $i ]]; then
1193 if type zipinfo &>/dev/null; then
1194 _comp_split -a classes "$(zipinfo -1 "$i" "$cur*" 2>/dev/null |
1195 - command grep '^[^$]*\.class$')"
1196 + command ggrep '^[^$]*\.class$')"
1197 elif type unzip &>/dev/null; then
1198 # Last column, between entries consisting entirely of dashes
1199 _comp_split -a classes "$(unzip -lq "$i" "$cur*" 2>/dev/null |
1200 @@ -78,7 +78,7 @@ _comp_cmd_java__classes()
1201 flag && $NF ~ /^[^$]*\.class/ { print $NF }')"
1202 elif type jar &>/dev/null; then
1203 _comp_split -a classes "$(jar tf "$i" "$cur" |
1204 - command grep '^[^$]*\.class$')"
1205 + command ggrep '^[^$]*\.class$')"
1206 fi
1207
1208 elif [[ -d $i ]]; then
1209 @@ -121,13 +121,13 @@ _comp_cmd_java__packages()
1210 _comp_expand_glob files '"$i/$cur"*' || continue
1211 _comp_split -la COMPREPLY "$(
1212 command ls -F -d "${files[@]}" 2>/dev/null |
1213 - command sed -e 's|^'"$i"'/||'
1214 + command gsed -e 's|^'"$i"'/||'
1215 )"
1216 fi
1217 done
1218 if ((${#COMPREPLY[@]} != 0)); then
1219 # keep only packages with the package suffix `/` being removed
1220 - _comp_split -l COMPREPLY "$(printf '%s\n' "${COMPREPLY[@]}" | command sed -n 's,/$,,p')"
1221 + _comp_split -l COMPREPLY "$(printf '%s\n' "${COMPREPLY[@]}" | command gsed -n 's,/$,,p')"
1222 # convert path syntax to package syntax
1223 ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]//\//.}")
1224 fi
1225 @@ -318,7 +318,7 @@ _comp_cmd_javac()
1226 # For some reason there may be -g:none AND -g:{lines,source,vars};
1227 # convert the none case to the curly brace format so it parses like
1228 # the others.
1229 - local opts=$("$1" $helpopt 2>&1 | command sed -e 's/-g:none/-g:{none}/' -ne \
1230 + local opts=$("$1" $helpopt 2>&1 | command gsed -e 's/-g:none/-g:{none}/' -ne \
1231 "s/^[[:space:]]*${cur%%:*}:{\([^}]\{1,\}\)}.*/\1/p")
1232 _comp_compgen -c "${cur#*:}" -- -W "${opts//,/ }"
1233 return
1234 diff -pruN bash-completion-2.15.0.old/completions/lilo bash-completion-2.15.0/completions/lilo
1235 --- bash-completion-2.15.0.old/completions/lilo 2024-11-24 23:21:02.000000000 +0100
1236 +++ bash-completion-2.15.0/completions/lilo 2024-11-30 21:20:52.071403690 +0100
1237 @@ -3,7 +3,7 @@
1238 _comp_cmd_lilo__labels()
1239 {
1240 _comp_compgen_split -- "$(_comp_awk -F = '$1 ~ /^[ \t]*label$/ {print $2}' \
1241 - "${1:-/etc/lilo.conf}" 2>/dev/null | command sed -e 's/\"//g')"
1242 + "${1:-/etc/lilo.conf}" 2>/dev/null | command gsed -e 's/\"//g')"
1243 }
1244
1245 _comp_cmd_lilo()
1246 diff -pruN bash-completion-2.15.0.old/completions/links bash-completion-2.15.0/completions/links
1247 --- bash-completion-2.15.0.old/completions/links 2024-11-24 23:21:02.000000000 +0100
1248 +++ bash-completion-2.15.0/completions/links 2024-11-30 21:20:51.985405389 +0100
1249 @@ -28,7 +28,7 @@ _comp_cmd_links()
1250 ;;
1251 -driver)
1252 local drivers=$("$1" -driver foo 2>&1 |
1253 - command sed -ne '$!d' -e '/^[a-z0-9, ]\{1,\}$/s/,/ /gp')
1254 + command gsed -ne '$!d' -e '/^[a-z0-9, ]\{1,\}$/s/,/ /gp')
1255 [[ $drivers ]] || drivers='x svgalib fb directfb pmshell atheos'
1256 _comp_compgen -- -W "$drivers"
1257 return
1258 diff -pruN bash-completion-2.15.0.old/completions/lintian bash-completion-2.15.0/completions/lintian
1259 --- bash-completion-2.15.0.old/completions/lintian 2024-11-24 23:21:02.000000000 +0100
1260 +++ bash-completion-2.15.0/completions/lintian 2024-11-30 21:20:52.270403920 +0100
1261 @@ -9,7 +9,7 @@ _comp_cmd_lintian__tags()
1262 if [[ $cur == *, ]]; then
1263 search=${cur//,/ }
1264 for item in $search; do
1265 - tags=$(command sed -e "s/\<$item\>//g" <<<"$tags")
1266 + tags=$(command gsed -e "s/\<$item\>//g" <<<"$tags")
1267 done
1268 _comp_compgen -aR -- -W "$tags"
1269 elif [[ $cur == *,* ]]; then
1270 @@ -29,11 +29,11 @@ _comp_cmd_lintian__checks()
1271 if [[ $cur == *, ]]; then
1272 search=${cur//,/ }
1273 for item in $search; do
1274 - match=$(command grep -nE "^(Check-Script|Abbrev): $item$" \
1275 + match=$(command ggrep -nE "^(Check-Script|Abbrev): $item$" \
1276 "${check_files[@]}" | cut -d: -f1)
1277 todisable=$(_comp_awk '/^(Check-Script|Abbrev)/ { print $2 }' "$match")
1278 for name in $todisable; do
1279 - checks=$(command sed -e "s/\<$name\>//g" <<<"$checks")
1280 + checks=$(command gsed -e "s/\<$name\>//g" <<<"$checks")
1281 done
1282 done
1283 _comp_compgen -aR -- -W "$checks"
1284 @@ -54,7 +54,7 @@ _comp_cmd_lintian__infos()
1285 if [[ $cur == *, ]]; then
1286 search=${cur//,/ }
1287 for item in $search; do
1288 - infos=$(command sed -e "s/\<$item\>//g" <<<"$infos")
1289 + infos=$(command gsed -e "s/\<$item\>//g" <<<"$infos")
1290 done
1291 _comp_compgen -aR -- -W "$infos"
1292 elif [[ $cur == *,* ]]; then
1293 diff -pruN bash-completion-2.15.0.old/completions/lvm bash-completion-2.15.0/completions/lvm
1294 --- bash-completion-2.15.0.old/completions/lvm 2024-11-24 23:21:02.000000000 +0100
1295 +++ bash-completion-2.15.0/completions/lvm 2024-11-30 21:20:52.302201964 +0100
1296 @@ -8,25 +8,25 @@ _comp_cmd_lvm__filedir()
1297 _comp_cmd_lvm__volumegroups()
1298 {
1299 _comp_compgen_split -- "$(vgscan 2>/dev/null |
1300 - command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')"
1301 + command gsed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')"
1302 }
1303
1304 _comp_cmd_lvm__physicalvolumes_all()
1305 {
1306 _comp_compgen_split -- "$(pvscan 2>/dev/null |
1307 - command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')"
1308 + command gsed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')"
1309 }
1310
1311 _comp_cmd_lvm__physicalvolumes()
1312 {
1313 _comp_compgen_split -- "$(pvscan 2>/dev/null |
1314 - command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')"
1315 + command gsed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')"
1316 }
1317
1318 _comp_cmd_lvm__logicalvolumes()
1319 {
1320 _comp_compgen_split -- "$(lvscan 2>/dev/null |
1321 - command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")"
1322 + command gsed -n -e "s|^.*'\(.*\)'.*$|\1|p")"
1323 if [[ $cur == /dev/mapper/* ]]; then
1324 _comp_compgen -a filedir
1325 local i
1326 diff -pruN bash-completion-2.15.0.old/completions/Makefile.in bash-completion-2.15.0/completions/Makefile.in
1327 --- bash-completion-2.15.0.old/completions/Makefile.in 2024-11-24 23:21:15.000000000 +0100
1328 +++ bash-completion-2.15.0/completions/Makefile.in 2024-11-30 21:20:52.284398886 +0100
1329 @@ -42,13 +42,13 @@ am__make_running_with_option = \
1330 *\\[\ \ ]*) \
1331 bs=\\; \
1332 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
1333 - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1334 + | gsed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1335 esac; \
1336 fi; \
1337 skip_next=no; \
1338 strip_trailopt () \
1339 { \
1340 - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
1341 + flg=`printf '%s\n' "$$flg" | gsed "s/$$1.*$$//"`; \
1342 }; \
1343 for flg in $$sane_makeflags; do \
1344 test $$skip_next = yes && { skip_next=no; continue; }; \
1345 @@ -126,27 +126,27 @@ am__can_run_installinfo = \
1346 n|no|NO) false;; \
1347 *) (install-info --version) >/dev/null 2>&1;; \
1348 esac
1349 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1350 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | gsed 's|.|.|g'`;
1351 am__vpath_adj = case $$p in \
1352 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1353 + $(srcdir)/*) f=`echo "$$p" | gsed "s|^$$srcdirstrip/||"`;; \
1354 *) f=$$p;; \
1355 esac;
1356 -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1357 +am__strip_dir = f=`echo $$p | gsed -e 's|^.*/||'`;
1358 am__install_max = 40
1359 am__nobase_strip_setup = \
1360 - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1361 + srcdirstrip=`echo "$(srcdir)" | gsed 's/[].[^$$\\*|]/\\\\&/g'`
1362 am__nobase_strip = \
1363 - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1364 + for p in $$list; do echo "$$p"; done | gsed -e "s|$$srcdirstrip/||"
1365 am__nobase_list = $(am__nobase_strip_setup); \
1366 for p in $$list; do echo "$$p $$p"; done | \
1367 - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1368 + gsed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1369 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1370 if (++n[$$2] == $(am__install_max)) \
1371 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1372 END { for (dir in files) print dir, files[dir] }'
1373 am__base_list = \
1374 - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1375 - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1376 + gsed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1377 + gsed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1378 am__uninstall_files_from_dir = { \
1379 test -z "$$files" \
1380 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1381 @@ -790,7 +790,7 @@ install-bashcompDATA: $(bashcomp_DATA)
1382 uninstall-bashcompDATA:
1383 @$(NORMAL_UNINSTALL)
1384 @list='$(bashcomp_DATA)'; test -n "$(bashcompdir)" || list=; \
1385 - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1386 + files=`for p in $$list; do echo $$p; done | gsed -e 's|^.*/||'`; \
1387 dir='$(DESTDIR)$(bashcompdir)'; $(am__uninstall_files_from_dir)
1388 tags TAGS:
1389
1390 @@ -802,21 +802,21 @@ distdir: $(BUILT_SOURCES)
1391 $(MAKE) $(AM_MAKEFLAGS) distdir-am
1392
1393 distdir-am: $(DISTFILES)
1394 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1395 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1396 + @srcdirstrip=`echo "$(srcdir)" | gsed 's/[].[^$$\\*]/\\\\&/g'`; \
1397 + topsrcdirstrip=`echo "$(top_srcdir)" | gsed 's/[].[^$$\\*]/\\\\&/g'`; \
1398 list='$(DISTFILES)'; \
1399 dist_files=`for file in $$list; do echo $$file; done | \
1400 - sed -e "s|^$$srcdirstrip/||;t" \
1401 + gsed -e "s|^$$srcdirstrip/||;t" \
1402 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1403 case $$dist_files in \
1404 */*) $(MKDIR_P) `echo "$$dist_files" | \
1405 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1406 + gsed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1407 sort -u` ;; \
1408 esac; \
1409 for file in $$dist_files; do \
1410 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1411 if test -d $$d/$$file; then \
1412 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1413 + dir=`echo "/$$file" | gsed -e 's,/[^/]*$$,,'`; \
1414 if test -d "$(distdir)/$$file"; then \
1415 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1416 fi; \
1417 diff -pruN bash-completion-2.15.0.old/completions/makepkg bash-completion-2.15.0/completions/makepkg
1418 --- bash-completion-2.15.0.old/completions/makepkg 2024-11-24 23:21:02.000000000 +0100
1419 +++ bash-completion-2.15.0/completions/makepkg 2024-11-30 21:20:51.950959352 +0100
1420 @@ -14,7 +14,7 @@ _comp_cmd_makepkg__slackware()
1421 esac
1422
1423 if [[ $cur == -* ]]; then
1424 - _comp_compgen_help - <<<"$("$1" | command sed -e "s/^options://")"
1425 + _comp_compgen_help - <<<"$("$1" | command gsed -e "s/^options://")"
1426 return
1427 fi
1428
1429 diff -pruN bash-completion-2.15.0.old/completions/mcrypt bash-completion-2.15.0/completions/mcrypt
1430 --- bash-completion-2.15.0.old/completions/mcrypt 2024-11-24 23:21:02.000000000 +0100
1431 +++ bash-completion-2.15.0/completions/mcrypt 2024-11-30 21:20:52.125208331 +0100
1432 @@ -26,7 +26,7 @@ _comp_cmd_mcrypt()
1433 ;;
1434 -h | --hash)
1435 _comp_compgen_split -- "$("$1" --list-hash 2>/dev/null |
1436 - command sed -e 1d)"
1437 + command gsed -e 1d)"
1438 return
1439 ;;
1440 -k | -s | --key | --keysize)
1441 diff -pruN bash-completion-2.15.0.old/completions/medusa bash-completion-2.15.0/completions/medusa
1442 --- bash-completion-2.15.0.old/completions/medusa 2024-11-24 23:21:02.000000000 +0100
1443 +++ bash-completion-2.15.0/completions/medusa 2024-11-30 21:20:52.456455467 +0100
1444 @@ -16,7 +16,7 @@ _comp_cmd_medusa()
1445 ;;
1446 -*M)
1447 _comp_compgen_split -- "$("$1" -d | _comp_awk '/^ +\+/ {print $2}' |
1448 - command sed -e 's/\.mod$//')"
1449 + command gsed -e 's/\.mod$//')"
1450 return
1451 ;;
1452 esac
1453 diff -pruN bash-completion-2.15.0.old/completions/mplayer bash-completion-2.15.0/completions/mplayer
1454 --- bash-completion-2.15.0.old/completions/mplayer 2024-11-24 23:21:02.000000000 +0100
1455 +++ bash-completion-2.15.0/completions/mplayer 2024-11-30 21:20:52.437715736 +0100
1456 @@ -4,8 +4,8 @@ _comp_cmd_mplayer__options()
1457 {
1458 cur=${cur%\\}
1459 _comp_compgen_split -- "$("$1" -noconfig all "$2" help 2>/dev/null |
1460 - command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | _comp_awk '{print $1}' |
1461 - command sed -e 's/:$//' -e 's/^'"${2#-}"'$//' -e 's/<.*//')"
1462 + command gsed -e '/^Available/,/^$/!d' -e '/^Available/d' | _comp_awk '{print $1}' |
1463 + command gsed -e 's/:$//' -e 's/^'"${2#-}"'$//' -e 's/<.*//')"
1464 }
1465
1466 _comp_cmd_mplayer()
1467 @@ -54,7 +54,7 @@ _comp_cmd_mplayer()
1468 ;;
1469 -subcp | -msgcharset)
1470 local cp
1471 - if _comp_split cp "$(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null)"; then
1472 + if _comp_split cp "$(iconv --list 2>/dev/null | command gsed -e "s@//@@;" 2>/dev/null)"; then
1473 if [[ $cur == "${cur,,}" ]]; then
1474 _comp_compgen -- -W '"${cp[@],,}"'
1475 else
1476 @@ -267,7 +267,7 @@ _comp_cmd_mplayer()
1477 case $cur in
1478 -*)
1479 _comp_compgen_split -- "$("$cmd" -noconfig all -list-options 2>/dev/null |
1480 - command sed -ne "1,/^[[:space:]]*Name/d" \
1481 + command gsed -ne "1,/^[[:space:]]*Name/d" \
1482 -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
1483 -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")"
1484 ;;
1485 diff -pruN bash-completion-2.15.0.old/completions/msynctool bash-completion-2.15.0/completions/msynctool
1486 --- bash-completion-2.15.0.old/completions/msynctool 2024-11-24 23:21:02.000000000 +0100
1487 +++ bash-completion-2.15.0/completions/msynctool 2024-11-30 21:20:52.375210452 +0100
1488 @@ -8,22 +8,22 @@ _comp_cmd_msynctool()
1489 case $words in
1490 --configure)
1491 _comp_compgen_split -- "$("$1" --showgroup "$prev" |
1492 - _comp_awk '/^Member/ {print $2}' | command sed -e 's/:$//')"
1493 + _comp_awk '/^Member/ {print $2}' | command gsed -e 's/:$//')"
1494 return
1495 ;;
1496 --addmember)
1497 - _comp_compgen_split -- "$("$1" --listplugins | command sed -e 1d)"
1498 + _comp_compgen_split -- "$("$1" --listplugins | command gsed -e 1d)"
1499 return
1500 ;;
1501 esac
1502
1503 case $prev in
1504 --configure | --addgroup | --delgroup | --showgroup | --sync | --addmember)
1505 - _comp_compgen_split -- "$("$1" --listgroups | command sed -e 1d)"
1506 + _comp_compgen_split -- "$("$1" --listgroups | command gsed -e 1d)"
1507 return
1508 ;;
1509 --showformats | --filter-objtype | --slow-sync)
1510 - _comp_compgen_split -- "$("$1" --listobjects | command sed -e 1d)"
1511 + _comp_compgen_split -- "$("$1" --listobjects | command gsed -e 1d)"
1512 return
1513 ;;
1514 esac
1515 diff -pruN bash-completion-2.15.0.old/completions/mutt bash-completion-2.15.0/completions/mutt
1516 --- bash-completion-2.15.0.old/completions/mutt 2024-11-24 23:21:02.000000000 +0100
1517 +++ bash-completion-2.15.0/completions/mutt 2024-11-30 21:20:52.451907770 +0100
1518 @@ -67,7 +67,7 @@ _comp_cmd_mutt__get_conffiles__visit()
1519 conffiles+=("$1")
1520
1521 local -a newconffiles
1522 - _comp_split newconffiles "$(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$1")" ||
1523 + _comp_split newconffiles "$(command gsed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$1")" ||
1524 return 0
1525
1526 local file REPLY
1527 @@ -90,7 +90,7 @@ _comp_cmd_mutt__aliases()
1528 local REPLY
1529 _comp_cmd_mutt__get_conffiles "$muttrc" || return 0
1530 conffiles=("${REPLY[@]}")
1531 - _comp_compgen -a split -- "$(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
1532 + _comp_compgen -a split -- "$(command gsed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
1533 "${conffiles[@]}")"
1534 }
1535
1536 @@ -101,7 +101,7 @@ _comp_cmd_mutt__query()
1537 [[ $cur ]] || return 0
1538 local muttcmd=${words[0]}
1539
1540 - local querycmd="$("$muttcmd" -Q query_command 2>/dev/null | command sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'"$cur"'|')"
1541 + local querycmd="$("$muttcmd" -Q query_command 2>/dev/null | command gsed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'"$cur"'|')"
1542 if [[ $querycmd ]]; then
1543 local REPLY
1544 _comp_expand_tilde "$querycmd"
1545 @@ -109,7 +109,7 @@ _comp_cmd_mutt__query()
1546 # generate queryresults:
1547 # $querycmd is expected to be a command with arguments
1548 _comp_compgen -a split -- "$($querycmd |
1549 - command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p')"
1550 + command gsed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p')"
1551 fi
1552 }
1553
1554 @@ -120,7 +120,7 @@ _comp_cmd_mutt__filedir()
1555 _comp_cmd_mutt__get_muttrc
1556 muttrc=$REPLY
1557 if [[ $cur == [=+]* ]]; then
1558 - folder="$("$muttcmd" -F "$muttrc" -Q folder 2>/dev/null | command sed -e 's|^folder=\"\(.*\)\"$|\1|')"
1559 + folder="$("$muttcmd" -F "$muttrc" -Q folder 2>/dev/null | command gsed -e 's|^folder=\"\(.*\)\"$|\1|')"
1560 [[ $folder ]] || folder=~/Mail
1561
1562 # Match any file in $folder beginning with $cur
1563 @@ -131,7 +131,7 @@ _comp_cmd_mutt__filedir()
1564 return
1565 elif [[ $cur == !* ]]; then
1566 spoolfile="$("$muttcmd" -F "$muttrc" -Q spoolfile 2>/dev/null |
1567 - command sed -e 's|^spoolfile=\"\(.*\)\"$|\1|')"
1568 + command gsed -e 's|^spoolfile=\"\(.*\)\"$|\1|')"
1569 if [[ $spoolfile ]]; then
1570 _comp_dequote "\"$spoolfile\"" && spoolfile=$REPLY
1571 cur=$spoolfile${cur:1}
1572 diff -pruN bash-completion-2.15.0.old/completions/mysql bash-completion-2.15.0/completions/mysql
1573 --- bash-completion-2.15.0.old/completions/mysql 2024-11-24 23:21:02.000000000 +0100
1574 +++ bash-completion-2.15.0/completions/mysql 2024-11-30 21:20:52.107997324 +0100
1575 @@ -35,7 +35,7 @@ _comp_cmd_mysql()
1576 ;;
1577 --database | -${noargopts}D)
1578 _comp_compgen_split -- "$(mysqlshow 2>/dev/null |
1579 - command sed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')"
1580 + command gsed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')"
1581 return
1582 ;;
1583
1584 @@ -102,7 +102,7 @@ _comp_cmd_mysql()
1585 esac
1586
1587 _comp_compgen_split -- "$(mysqlshow 2>/dev/null |
1588 - command sed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')"
1589 + command gsed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')"
1590 } &&
1591 complete -F _comp_cmd_mysql mysql
1592
1593 diff -pruN bash-completion-2.15.0.old/completions/ncftp bash-completion-2.15.0/completions/ncftp
1594 --- bash-completion-2.15.0.old/completions/ncftp 2024-11-24 23:21:02.000000000 +0100
1595 +++ bash-completion-2.15.0/completions/ncftp 2024-11-30 21:20:52.135565910 +0100
1596 @@ -17,7 +17,7 @@ _comp_cmd_ncftp()
1597 fi
1598
1599 if [[ $cword -eq 1 && -f ~/.ncftp/bookmarks ]]; then
1600 - _comp_compgen_split -- "$(command sed -ne \
1601 + _comp_compgen_split -- "$(command gsed -ne \
1602 's/^\([^,]\{1,\}\),.*$/\1/p' ~/.ncftp/bookmarks)"
1603 fi
1604
1605 diff -pruN bash-completion-2.15.0.old/completions/nmap bash-completion-2.15.0/completions/nmap
1606 --- bash-completion-2.15.0.old/completions/nmap 2024-11-24 23:21:02.000000000 +0100
1607 +++ bash-completion-2.15.0/completions/nmap 2024-11-30 21:20:52.226872345 +0100
1608 @@ -36,7 +36,7 @@ _comp_cmd_nmap()
1609 # strip everything following a non-option name or = char
1610 # TODO: should expand -T<0-5> to -T0 ... -T5
1611 _comp_compgen_split -- "$(
1612 - "$1" --help 2>&1 | command sed \
1613 + "$1" --help 2>&1 | command gsed \
1614 -e "s/:.*$//" \
1615 -e "s/=.*$/=/" \
1616 -e "s/;[[:space:]]*-/ -/g" \
1617 diff -pruN bash-completion-2.15.0.old/completions/openssl bash-completion-2.15.0/completions/openssl
1618 --- bash-completion-2.15.0.old/completions/openssl 2024-11-24 23:21:02.000000000 +0100
1619 +++ bash-completion-2.15.0/completions/openssl 2024-11-30 21:20:52.046932270 +0100
1620 @@ -33,8 +33,8 @@ _comp_cmd_openssl__compgen_digests()
1621 _comp_awk '/^-.*[ \t]to use the .* message digest algorithm/ { print $1 }'
1622 )"
1623 _comp_compgen -ac "${cur#-}" split -P "-" -- "$("$1" help 2>&1 |
1624 - command sed -ne '/^Message Digest commands/,/^[[:space:]]*$/p' |
1625 - command sed -e 1d)"
1626 + command gsed -ne '/^Message Digest commands/,/^[[:space:]]*$/p' |
1627 + command gsed -e 1d)"
1628 }
1629
1630 _comp_cmd_openssl()
1631 @@ -46,7 +46,7 @@ _comp_cmd_openssl()
1632
1633 if ((cword == 1)); then
1634 local commands
1635 - commands="$("$1" help 2>&1 | command sed -e '/commands\|help:/d')"
1636 + commands="$("$1" help 2>&1 | command gsed -e '/commands\|help:/d')"
1637 _comp_compgen -- -W "$commands"
1638 else
1639 command=${words[1]}
1640 diff -pruN bash-completion-2.15.0.old/completions/pdftotext bash-completion-2.15.0/completions/pdftotext
1641 --- bash-completion-2.15.0.old/completions/pdftotext 2024-11-24 23:21:02.000000000 +0100
1642 +++ bash-completion-2.15.0/completions/pdftotext 2024-11-30 21:20:52.394866709 +0100
1643 @@ -12,7 +12,7 @@ _comp_cmd_pdftotext()
1644 ;;
1645 -enc)
1646 _comp_compgen_split -- "$("$1" -listenc 2>/dev/null |
1647 - command sed -e 1d)"
1648 + command gsed -e 1d)"
1649 return
1650 ;;
1651 -eol)
1652 diff -pruN bash-completion-2.15.0.old/completions/perl bash-completion-2.15.0/completions/perl
1653 --- bash-completion-2.15.0.old/completions/perl 2024-11-24 23:21:02.000000000 +0100
1654 +++ bash-completion-2.15.0/completions/perl 2024-11-30 21:20:51.858413689 +0100
1655 @@ -131,7 +131,7 @@ _comp_cmd_perldoc()
1656 _comp_cmd_perl__helper "" perldocs
1657 if [[ $cur == p* ]]; then
1658 _comp_compgen -a split -- "$(PERLDOC_PAGER=cat "$1" -u perl |
1659 - command sed -ne '/perl.*Perl overview/,/perlwin32/p' |
1660 + command gsed -ne '/perl.*Perl overview/,/perlwin32/p' |
1661 _comp_awk 'NF >= 2 && $1 ~ /^perl/ { print $1 }')"
1662 fi
1663 fi
1664 diff -pruN bash-completion-2.15.0.old/completions/pgrep bash-completion-2.15.0/completions/pgrep
1665 --- bash-completion-2.15.0.old/completions/pgrep 2024-11-24 23:21:02.000000000 +0100
1666 +++ bash-completion-2.15.0/completions/pgrep 2024-11-30 21:20:52.423741564 +0100
1667 @@ -38,7 +38,7 @@ _comp_cmd_pgrep()
1668 --nslist)
1669 _comp_compgen -c "${cur##*,}" split -F $' \t\n,' -- "$(
1670 "$1" --help 2>&1 |
1671 - command sed -ne 's/^[[:space:]]*Available namespaces://p'
1672 + command gsed -ne 's/^[[:space:]]*Available namespaces://p'
1673 )" &&
1674 _comp_delimited , -W '"${COMPREPLY[@]}"'
1675 return
1676 @@ -48,7 +48,7 @@ _comp_cmd_pgrep()
1677 if [[ $cur == -* ]]; then
1678 _comp_compgen_help ||
1679 _comp_compgen_usage - <<<"$("$1" --usage 2>&1 |
1680 - command sed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//")"
1681 + command gsed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//")"
1682 [[ $cword -eq 1 && $1 == *pkill ]] && _comp_compgen -a signals -
1683 return
1684 fi
1685 diff -pruN bash-completion-2.15.0.old/completions/pkgadd bash-completion-2.15.0/completions/pkgadd
1686 --- bash-completion-2.15.0.old/completions/pkgadd 2024-11-24 23:21:02.000000000 +0100
1687 +++ bash-completion-2.15.0/completions/pkgadd 2024-11-30 21:20:51.956972905 +0100
1688 @@ -48,7 +48,7 @@ _comp_cmd_pkgadd()
1689 local REPLY
1690 _comp_dequote "$device"
1691 _comp_split -l pkginst_list "$(strings "${REPLY-}" |
1692 - command sed -n 's/^PKG=//p' | sort -u)"
1693 + command gsed -n 's/^PKG=//p' | sort -u)"
1694 fi
1695 ((${#pkginst_list[@]})) &&
1696 _comp_compgen -- -W '"${pkginst_list[@]}"'
1697 diff -pruN bash-completion-2.15.0.old/completions/pngfix bash-completion-2.15.0/completions/pngfix
1698 --- bash-completion-2.15.0.old/completions/pngfix 2024-11-24 23:21:02.000000000 +0100
1699 +++ bash-completion-2.15.0/completions/pngfix 2024-11-30 21:20:52.049224557 +0100
1700 @@ -15,7 +15,7 @@ _comp_cmd_pngfix()
1701 ;;
1702 --strip)
1703 _comp_compgen_split -F '|' -- "$("$1" --help 2>&1 |
1704 - command sed -ne 's/.*--strip=\[\([^]]*\)\].*/\1/p')"
1705 + command gsed -ne 's/.*--strip=\[\([^]]*\)\].*/\1/p')"
1706 return
1707 ;;
1708 esac
1709 diff -pruN bash-completion-2.15.0.old/completions/postcat bash-completion-2.15.0/completions/postcat
1710 --- bash-completion-2.15.0.old/completions/postcat 2024-11-24 23:21:02.000000000 +0100
1711 +++ bash-completion-2.15.0/completions/postcat 2024-11-30 21:20:52.336789302 +0100
1712 @@ -23,7 +23,7 @@ _comp_cmd_postcat()
1713 done
1714 if [[ $qfile ]]; then
1715 _comp_compgen_split -- "$(mailq 2>/dev/null |
1716 - command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
1717 + command gsed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
1718 return
1719 fi
1720
1721 diff -pruN bash-completion-2.15.0.old/completions/postsuper bash-completion-2.15.0/completions/postsuper
1722 --- bash-completion-2.15.0.old/completions/postsuper 2024-11-24 23:21:02.000000000 +0100
1723 +++ bash-completion-2.15.0/completions/postsuper 2024-11-30 21:20:52.139032870 +0100
1724 @@ -12,17 +12,17 @@ _comp_cmd_postsuper()
1725 ;;
1726 -[dr])
1727 _comp_compgen_split -- "ALL $(mailq 2>/dev/null |
1728 - command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
1729 + command gsed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
1730 return
1731 ;;
1732 -h)
1733 _comp_compgen_split -- "ALL $(mailq 2>/dev/null |
1734 - command sed \
1735 + command gsed \
1736 -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* ].*$//; /!$/d')"
1737 return
1738 ;;
1739 -H)
1740 - _comp_compgen_split -- "ALL $(mailq 2>/dev/null | command sed \
1741 + _comp_compgen_split -- "ALL $(mailq 2>/dev/null | command gsed \
1742 -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; /^[0-9A-Z]*[* ]/d; s/!.*$//')"
1743 return
1744 ;;
1745 diff -pruN bash-completion-2.15.0.old/completions/povray bash-completion-2.15.0/completions/povray
1746 --- bash-completion-2.15.0.old/completions/povray 2024-11-24 23:21:02.000000000 +0100
1747 +++ bash-completion-2.15.0/completions/povray 2024-11-30 21:20:52.337951598 +0100
1748 @@ -23,7 +23,7 @@ _comp_cmd_povray()
1749 # guess what output file type user may want
1750 case $(
1751 IFS=$'\n'
1752 - command grep '^[-+]F' <<<"${words[*]}"
1753 + command ggrep '^[-+]F' <<<"${words[*]}"
1754 ) in
1755 [-+]FN) oext=png ;;
1756 [-+]FP) oext=ppm ;;
1757 @@ -48,7 +48,7 @@ _comp_cmd_povray()
1758 cur="${povcur#*\[}"
1759 pfx="${povcur%\["$cur"}" # prefix == filename
1760 [[ -f $pfx && -r $pfx ]] || return
1761 - _comp_compgen_split -l -- "$(command sed -ne \
1762 + _comp_compgen_split -l -- "$(command gsed -ne \
1763 's/^[[:space:]]*\[\([^]]*\]\).*$/\1/p' -- "$pfx")" &&
1764 # to prevent [bar] expand to nothing. can be done more easily?
1765 _comp_compgen -Rv COMPREPLY -- -P "${pfx}[" -W '"${COMPREPLY[@]}"'
1766 diff -pruN bash-completion-2.15.0.old/completions/ps bash-completion-2.15.0/completions/ps
1767 --- bash-completion-2.15.0.old/completions/ps 2024-11-24 23:21:02.000000000 +0100
1768 +++ bash-completion-2.15.0/completions/ps 2024-11-30 21:20:52.349300526 +0100
1769 @@ -61,7 +61,7 @@ _comp_cmd_ps()
1770 "$1" --help
1771 "$1" --help all
1772 } 2>/dev/null |
1773 - command sed -e "s/, [A-Za-z],/,/")" ||
1774 + command gsed -e "s/, [A-Za-z],/,/")" ||
1775 _comp_compgen_usage
1776 fi
1777 } &&
1778 diff -pruN bash-completion-2.15.0.old/completions/puppet bash-completion-2.15.0/completions/puppet
1779 --- bash-completion-2.15.0.old/completions/puppet 2024-11-24 23:21:02.000000000 +0100
1780 +++ bash-completion-2.15.0/completions/puppet 2024-11-30 21:20:52.062177705 +0100
1781 @@ -24,7 +24,7 @@ _comp_cmd_puppet__certs()
1782 if [[ $1 == --all ]]; then
1783 cert_list=$(
1784 $puppetca --list --all |
1785 - command sed -e 's/^[+-]\{0,1\}[[:space:]]*\([^[:space:]]\{1,\}\)[[:space:]]\{1,\}.*$/\1/'
1786 + command gsed -e 's/^[+-]\{0,1\}[[:space:]]*\([^[:space:]]\{1,\}\)[[:space:]]\{1,\}.*$/\1/'
1787 )
1788 else
1789 cert_list=$("$puppetca" --list)
1790 @@ -35,7 +35,7 @@ _comp_cmd_puppet__certs()
1791 _comp_cmd_puppet__types()
1792 {
1793 puppet_types=$(
1794 - puppet describe --list | command sed -e 's/^\([^[:space:]]\{1,\}\).*$/\1/'
1795 + puppet describe --list | command gsed -e 's/^\([^[:space:]]\{1,\}\).*$/\1/'
1796 )
1797 _comp_compgen -a -- -W "$puppet_types"
1798 }
1799 @@ -47,7 +47,7 @@ _comp_cmd_puppet__references()
1800 puppetdoc=puppetdoc
1801
1802 puppet_doc_list=$(
1803 - $puppetdoc --list | command sed -e 's/^\([^[:space:]]\{1,\}\).*$/\1/'
1804 + $puppetdoc --list | command gsed -e 's/^\([^[:space:]]\{1,\}\).*$/\1/'
1805 )
1806 _comp_compgen -a -- -W "$puppet_doc_list"
1807 }
1808 diff -pruN bash-completion-2.15.0.old/completions/pydoc bash-completion-2.15.0/completions/pydoc
1809 --- bash-completion-2.15.0.old/completions/pydoc 2024-11-24 23:21:02.000000000 +0100
1810 +++ bash-completion-2.15.0/completions/pydoc 2024-11-30 21:20:52.321543150 +0100
1811 @@ -16,7 +16,7 @@ _comp_cmd_pydoc()
1812 esac
1813
1814 if [[ $cur == -* ]]; then
1815 - _comp_compgen_help - <<<"$("$1" | command sed -e "s/^pydoc3\{0,1\} //")"
1816 + _comp_compgen_help - <<<"$("$1" | command gsed -e "s/^pydoc3\{0,1\} //")"
1817 return
1818 fi
1819
1820 @@ -32,7 +32,7 @@ _comp_cmd_pydoc()
1821 # Note that we don't do "pydoc modules" as it is known to hang on
1822 # some systems; _comp_xfunc_python_modules tends to work better and faster.
1823 _comp_compgen -a split -- "$("$1" keywords topics |
1824 - command sed -e '/^Here/d')"
1825 + command gsed -e '/^Here/d')"
1826
1827 _comp_compgen -a filedir py
1828 } &&
1829 diff -pruN bash-completion-2.15.0.old/completions/pylint bash-completion-2.15.0/completions/pylint
1830 --- bash-completion-2.15.0.old/completions/pylint 2024-11-24 23:21:02.000000000 +0100
1831 +++ bash-completion-2.15.0/completions/pylint 2024-11-30 21:20:52.054987507 +0100
1832 @@ -11,10 +11,10 @@ _comp_cmd_pylint__message_ids()
1833 local msgs="$(
1834 set -o pipefail
1835 "$1" --list-msgs-enabled 2>/dev/null |
1836 - command sed -ne "$filter" |
1837 - command sed -ne 's/^[[:space:]]\{1,\}\([a-z-]\{6,\}\).*/\1/p' ||
1838 + command gsed -ne "$filter" |
1839 + command gsed -ne 's/^[[:space:]]\{1,\}\([a-z-]\{6,\}\).*/\1/p' ||
1840 "$1" --list-msgs 2>/dev/null |
1841 - command sed -ne 's/^:\([a-z-]\{6,\}\).*/\1/p'
1842 + command gsed -ne 's/^:\([a-z-]\{6,\}\).*/\1/p'
1843 )"
1844 _comp_delimited , -W "$msgs"
1845 }
1846 diff -pruN bash-completion-2.15.0.old/completions/pytest bash-completion-2.15.0/completions/pytest
1847 --- bash-completion-2.15.0.old/completions/pytest 2024-11-24 23:21:02.000000000 +0100
1848 +++ bash-completion-2.15.0/completions/pytest 2024-11-30 21:20:52.303320826 +0100
1849 @@ -3,7 +3,7 @@
1850 _comp_cmd_pytest__option_choice_args()
1851 {
1852 local modes=$("$1" "$2=bash-completion-nonexistent" 2>&1 |
1853 - command sed -e 's/[^[:space:][:alnum:]_-]\{1,\}//g' \
1854 + command gsed -e 's/[^[:space:][:alnum:]_-]\{1,\}//g' \
1855 -ne 's/.*choose from //p')
1856 _comp_compgen -a -- -W '$modes'
1857 }
1858 diff -pruN bash-completion-2.15.0.old/completions/qdbus bash-completion-2.15.0/completions/qdbus
1859 --- bash-completion-2.15.0.old/completions/qdbus 2024-11-24 23:21:02.000000000 +0100
1860 +++ bash-completion-2.15.0/completions/qdbus 2024-11-30 21:20:52.004080799 +0100
1861 @@ -6,7 +6,7 @@ _comp_cmd_qdbus()
1862 _comp_initialize -- "$@" || return
1863
1864 _comp_compgen_split -- "$(
1865 - command "${words[@]::cword}" 2>/dev/null | command sed 's/(.*)//'
1866 + command "${words[@]::cword}" 2>/dev/null | command gsed 's/(.*)//'
1867 )"
1868 } &&
1869 complete -F _comp_cmd_qdbus qdbus dcop
1870 diff -pruN bash-completion-2.15.0.old/completions/reportbug bash-completion-2.15.0/completions/reportbug
1871 --- bash-completion-2.15.0.old/completions/reportbug 2024-11-24 23:21:02.000000000 +0100
1872 +++ bash-completion-2.15.0/completions/reportbug 2024-11-30 21:20:51.983019078 +0100
1873 @@ -33,7 +33,7 @@ _comp_cmd_reportbug()
1874 ;;
1875 --tag | --ui | --interface | --type | --bts | --severity | --mode | -${noargopts}[TutBS])
1876 _comp_compgen_split -- "$("$1" "$prev" help 2>&1 |
1877 - command sed -ne '/^[[:space:]]/p')"
1878 + command gsed -ne '/^[[:space:]]/p')"
1879 return
1880 ;;
1881 --editor | --mua | --mbox-reader-cmd | -${noargopts}e)
1882 diff -pruN bash-completion-2.15.0.old/completions/rpcdebug bash-completion-2.15.0/completions/rpcdebug
1883 --- bash-completion-2.15.0.old/completions/rpcdebug 2024-11-24 23:21:02.000000000 +0100
1884 +++ bash-completion-2.15.0/completions/rpcdebug 2024-11-30 21:20:51.938678957 +0100
1885 @@ -13,7 +13,7 @@ _comp_cmd_rpcdebug__flags()
1886
1887 if [[ $module ]]; then
1888 _comp_compgen_split -- "$(rpcdebug -vh 2>&1 |
1889 - command sed -ne 's/^'"$module"'[[:space:]]\{1,\}//p')"
1890 + command gsed -ne 's/^'"$module"'[[:space:]]\{1,\}//p')"
1891 fi
1892 }
1893
1894 diff -pruN bash-completion-2.15.0.old/completions/rpm bash-completion-2.15.0/completions/rpm
1895 --- bash-completion-2.15.0.old/completions/rpm 2024-11-24 23:21:02.000000000 +0100
1896 +++ bash-completion-2.15.0/completions/rpm 2024-11-30 21:20:52.176504056 +0100
1897 @@ -13,7 +13,7 @@ _comp_cmd_rpm__compgen_installed_package
1898 if [[ -r /var/log/rpmpkgs &&
1899 /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then
1900 # using RHL 7.2 or later - this is quicker than querying the DB
1901 - _comp_compgen_split -- "$(command sed -ne \
1902 + _comp_compgen_split -- "$(command gsed -ne \
1903 's|^\([^[:space:]]\{1,\}\)-[^[:space:]-]\{1,\}-[^[:space:]-]\{1,\}\.rpm$|\1|p' \
1904 /var/log/rpmpkgs)"
1905 elif type rpmqpack &>/dev/null; then
1906 @@ -37,7 +37,7 @@ _comp_cmd_rpm__groups()
1907 _comp_cmd_rpm__macros()
1908 {
1909 # get a list of macros
1910 - _comp_compgen_split -- "$("${1:-rpm}" --showrc | command sed -ne \
1911 + _comp_compgen_split -- "$("${1:-rpm}" --showrc | command gsed -ne \
1912 's/^-\{0,1\}[0-9]\{1,\}[:=][[:space:]]\{1,\}\([^[:space:](]\{3,\}\).*/%\1/p')"
1913 }
1914
1915 @@ -46,7 +46,7 @@ _comp_cmd_rpm__buildarchs()
1916 {
1917 # Case-insensitive BRE to match "compatible build archs"
1918 local regex_header='[cC][oO][mM][pP][aA][tT][iI][bB][lL][eE][[:space:]]\{1,\}[bB][uU][iI][lL][dD][[:space:]]\{1,\}[aA][rR][cC][hH][sS]'
1919 - _comp_compgen_split -- "$("${1:-rpm}" --showrc | command sed -ne \
1920 + _comp_compgen_split -- "$("${1:-rpm}" --showrc | command gsed -ne \
1921 "s/^[[:space:]]*${regex_header}[[:space:]]*:[[:space:]]*\(.*\)/\1/p")"
1922 }
1923
1924 @@ -120,7 +120,7 @@ _comp_cmd_rpm()
1925 esac
1926 _comp_compgen_split -l -- "$("$1" -qa --nodigest \
1927 --nosignature --queryformat="\"$fmt\\n\"" 2>/dev/null |
1928 - command grep -vF '(none)')"
1929 + command ggrep -vF '(none)')"
1930 fi
1931 return
1932 ;;
1933 @@ -281,7 +281,7 @@ _comp_cmd_rpmbuild()
1934 _comp_cmd_rpm__configdir
1935 if [[ $cfgdir ]]; then
1936 _comp_compgen_split -- "$(command ls "$cfgdir" 2>/dev/null |
1937 - command sed -ne 's/^brp-//p')"
1938 + command gsed -ne 's/^brp-//p')"
1939 fi
1940 ;;
1941 --define | --with | --without | -${noargopts}D)
1942 diff -pruN bash-completion-2.15.0.old/completions/rsync bash-completion-2.15.0/completions/rsync
1943 --- bash-completion-2.15.0.old/completions/rsync 2024-11-24 23:21:02.000000000 +0100
1944 +++ bash-completion-2.15.0/completions/rsync 2024-11-30 21:20:52.166080144 +0100
1945 @@ -85,7 +85,7 @@ _comp_cmd_rsync()
1946 # meaning before v3.2.0) contain the following unusual line in
1947 # --help:
1948 # "(-h) --help show this help (-h is --help only if used alone)"
1949 - _comp_compgen -Rv tmp help - <<<"$("$1" --help 2>&1 | command sed -e 's/^([^)]*)//')"
1950 + _comp_compgen -Rv tmp help - <<<"$("$1" --help 2>&1 | command gsed -e 's/^([^)]*)//')"
1951
1952 _comp_compgen -- -W '"${tmp[@]}"
1953 --daemon --old-d{,irs}
1954 @@ -102,7 +102,7 @@ _comp_cmd_rsync()
1955 fi
1956 done
1957 if [[ $shell == ssh ]]; then
1958 - local rsync_version=$("$1" --version 2>/dev/null | sed -n '1s/.*rsync *version \([0-9.]*\).*/\1/p')
1959 + local rsync_version=$("$1" --version 2>/dev/null | gsed -n '1s/.*rsync *version \([0-9.]*\).*/\1/p')
1960 _comp_cmd_rsync__vercomp "$rsync_version" "3.2.4"
1961 if (($? == 2)); then
1962 _comp_compgen -x scp remote_files
1963 diff -pruN bash-completion-2.15.0.old/completions/sbopkg bash-completion-2.15.0/completions/sbopkg
1964 --- bash-completion-2.15.0.old/completions/sbopkg 2024-11-24 23:21:02.000000000 +0100
1965 +++ bash-completion-2.15.0/completions/sbopkg 2024-11-30 21:20:52.372973228 +0100
1966 @@ -61,7 +61,7 @@ _comp_cmd_sbopkg()
1967 local file=${REPO_ROOT-}/${REPO_NAME-}/${REPO_BRANCH-}/SLACKBUILDS.TXT
1968 [[ -f $file && -r $file ]] || return
1969
1970 - _comp_compgen_split -l -- "$(command sed -ne "s/^SLACKBUILD NAME: //p" \
1971 + _comp_compgen_split -l -- "$(command gsed -ne "s/^SLACKBUILD NAME: //p" \
1972 "$file")"
1973 _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
1974 } &&
1975 diff -pruN bash-completion-2.15.0.old/completions/screen bash-completion-2.15.0/completions/screen
1976 --- bash-completion-2.15.0.old/completions/screen 2024-11-24 23:21:02.000000000 +0100
1977 +++ bash-completion-2.15.0/completions/screen 2024-11-30 21:20:52.065753988 +0100
1978 @@ -3,7 +3,7 @@
1979 _comp_cmd_screen__sessions()
1980 {
1981 local -a sessions
1982 - _comp_split sessions "$(command screen -ls | command sed -ne \
1983 + _comp_split sessions "$(command screen -ls | command gsed -ne \
1984 's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p')" || return
1985 if [[ $cur == +([0-9])?(.*) ]]; then
1986 # Complete sessions including pid prefixes
1987 diff -pruN bash-completion-2.15.0.old/completions/shellcheck bash-completion-2.15.0/completions/shellcheck
1988 --- bash-completion-2.15.0.old/completions/shellcheck 2024-11-24 23:21:02.000000000 +0100
1989 +++ bash-completion-2.15.0/completions/shellcheck 2024-11-30 21:20:52.082836598 +0100
1990 @@ -3,7 +3,7 @@
1991 _comp_cmd_shellcheck__optarg()
1992 {
1993 local args=$("$1" --help 2>&1 |
1994 - command sed -e 's/,/ /g' -ne 's/^.*'"$2"'\>.*(\([^)]*\)).*/\1/p')
1995 + command gsed -e 's/,/ /g' -ne 's/^.*'"$2"'\>.*(\([^)]*\)).*/\1/p')
1996 _comp_compgen -a -- -W '$args'
1997 }
1998
1999 @@ -23,8 +23,8 @@ _comp_cmd_shellcheck()
2000 ;;
2001 --format | -${noargopts}f)
2002 local args=$("$1" --format=nonexistent-format /dev/null 2>&1 |
2003 - command sed -ne '/^Supported formats/,//p' |
2004 - command sed -ne '/^[[:space:]]/p')
2005 + command gsed -ne '/^Supported formats/,//p' |
2006 + command gsed -ne '/^[[:space:]]/p')
2007 _comp_compgen -- -W '$args'
2008 return
2009 ;;
2010 diff -pruN bash-completion-2.15.0.old/completions/sitecopy bash-completion-2.15.0/completions/sitecopy
2011 --- bash-completion-2.15.0.old/completions/sitecopy 2024-11-24 23:21:02.000000000 +0100
2012 +++ bash-completion-2.15.0/completions/sitecopy 2024-11-30 21:20:51.990204538 +0100
2013 @@ -44,7 +44,7 @@ _comp_cmd_sitecopy()
2014
2015 if [[ -r ~/.sitecopyrc ]]; then
2016 _comp_compgen_split -- "$("$1" -v |
2017 - command sed -n '/^Site:/s/Site: //p')"
2018 + command gsed -n '/^Site:/s/Site: //p')"
2019 fi
2020 } &&
2021 complete -F _comp_cmd_sitecopy -o default sitecopy
2022 diff -pruN bash-completion-2.15.0.old/completions/slabtop bash-completion-2.15.0/completions/slabtop
2023 --- bash-completion-2.15.0.old/completions/slabtop 2024-11-24 23:21:02.000000000 +0100
2024 +++ bash-completion-2.15.0/completions/slabtop 2024-11-30 21:20:52.101128548 +0100
2025 @@ -13,7 +13,7 @@ _comp_cmd_slabtop()
2026 ;;
2027 --sort | -${noargopts}s)
2028 _comp_compgen_split -- "$(
2029 - "$1" --help | command sed \
2030 + "$1" --help | command gsed \
2031 -e '/^The following are valid sort criteria/,/^$/!d' \
2032 -ne 's/^[[:space:]]\(.\):.*/\1/p'
2033 )"
2034 diff -pruN bash-completion-2.15.0.old/completions/slapt-get bash-completion-2.15.0/completions/slapt-get
2035 --- bash-completion-2.15.0.old/completions/slapt-get 2024-11-24 23:21:02.000000000 +0100
2036 +++ bash-completion-2.15.0/completions/slapt-get 2024-11-30 21:20:52.442654180 +0100
2037 @@ -62,14 +62,14 @@ _comp_cmd_slapt_get()
2038 local name=${cur%%-*}
2039 _comp_compgen_split -l -- "$(
2040 LC_ALL=C "$1" -c "$config" --search "^$name" 2>/dev/null |
2041 - LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p;}"
2042 + LC_ALL=C command gsed -ne "/^$cur/{s/ .*$//;p;}"
2043 )"
2044 return
2045 ;;
2046 avl) # --install|-i|
2047 _comp_compgen_split -l -- "$(
2048 LC_ALL=C "$1" -c "$config" --available 2>/dev/null |
2049 - LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p;}"
2050 + LC_ALL=C command gsed -ne "/^$cur/{s/ .*$//;p;}"
2051 )"
2052 return
2053 ;;
2054 diff -pruN bash-completion-2.15.0.old/completions/slapt-src bash-completion-2.15.0/completions/slapt-src
2055 --- bash-completion-2.15.0.old/completions/slapt-src 2024-11-24 23:21:02.000000000 +0100
2056 +++ bash-completion-2.15.0/completions/slapt-src 2024-11-30 21:20:52.168369893 +0100
2057 @@ -59,13 +59,13 @@ _comp_cmd_slapt_src()
2058 _comp_compgen_split -l -- "$(
2059 LC_ALL=C
2060 "$1" --config "$config" --search "^$name" 2>/dev/null |
2061 - command sed -ne "/^$cur/{s/^$name:\([^ ]*\) .*$/\1/;p;}"
2062 + command gsed -ne "/^$cur/{s/^$name:\([^ ]*\) .*$/\1/;p;}"
2063 )"
2064 else
2065 _comp_compgen_split -l -- "$(
2066 LC_ALL=C
2067 "$1" --config "$config" --search "^$cur" 2>/dev/null |
2068 - command sed -ne "/^$cur/{s/ .*$//;p;}"
2069 + command gsed -ne "/^$cur/{s/ .*$//;p;}"
2070 )"
2071 fi
2072 } &&
2073 diff -pruN bash-completion-2.15.0.old/completions/smbclient bash-completion-2.15.0/completions/smbclient
2074 --- bash-completion-2.15.0.old/completions/smbclient 2024-11-24 23:21:02.000000000 +0100
2075 +++ bash-completion-2.15.0/completions/smbclient 2024-11-30 21:20:51.882915014 +0100
2076 @@ -16,7 +16,7 @@ _comp_cmd_smbclient__hosts()
2077 {
2078 if [[ ${BASH_COMPLETION_CMD_SMBTREE_SCAN-${COMP_SAMBA_SCAN-}} ]]; then
2079 _comp_compgen_split -- "$(smbtree -N -S |
2080 - command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p')"
2081 + command gsed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p')"
2082 fi
2083 }
2084
2085 diff -pruN bash-completion-2.15.0.old/completions/ss bash-completion-2.15.0/completions/ss
2086 --- bash-completion-2.15.0.old/completions/ss 2024-11-24 23:21:02.000000000 +0100
2087 +++ bash-completion-2.15.0/completions/ss 2024-11-30 21:20:51.958161854 +0100
2088 @@ -17,7 +17,7 @@ _comp_cmd_ss()
2089 ;;
2090 --query | -${noargopts}A)
2091 local queries=$("$1" --help |
2092 - command sed -e 's/|/ /g' -ne 's/.*QUERY := {\([^}]*\)}.*/\1/p')
2093 + command gsed -e 's/|/ /g' -ne 's/.*QUERY := {\([^}]*\)}.*/\1/p')
2094 _comp_delimited , -W '$queries'
2095 return
2096 ;;
2097 diff -pruN bash-completion-2.15.0.old/completions/ssh bash-completion-2.15.0/completions/ssh
2098 --- bash-completion-2.15.0.old/completions/ssh 2024-11-24 23:21:02.000000000 +0100
2099 +++ bash-completion-2.15.0/completions/ssh 2024-11-30 21:20:52.197591384 +0100
2100 @@ -494,7 +494,7 @@ _comp_xfunc_scp_compgen_remote_files()
2101
2102 # unescape (3 backslashes to 1 for chars we escaped)
2103 # shellcheck disable=SC2090
2104 - _path=$(command sed -e 's/\\\\\\\('"$_comp_cmd_scp__path_esc"'\)/\\\1/g' <<<"$_path")
2105 + _path=$(command gsed -e 's/\\\\\\\('"$_comp_cmd_scp__path_esc"'\)/\\\1/g' <<<"$_path")
2106
2107 # default to home dir of specified user on remote host
2108 if [[ ! $_path ]]; then
2109 @@ -512,14 +512,14 @@ _comp_xfunc_scp_compgen_remote_files()
2110 # shellcheck disable=SC2090
2111 _files=$(ssh -o 'Batchmode yes' "$_userhost" \
2112 command ls -aF1dL "$_path*" 2>/dev/null |
2113 - command sed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$_escape_replacement"'/g' -e '/[^\/]$/d')
2114 + command gsed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$_escape_replacement"'/g' -e '/[^\/]$/d')
2115 else
2116 # escape problematic characters; remove executables, aliases, pipes
2117 # and sockets; add space at end of file names
2118 # shellcheck disable=SC2090
2119 _files=$(ssh -o 'Batchmode yes' "$_userhost" \
2120 command ls -aF1dL "$_path*" 2>/dev/null |
2121 - command sed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$_escape_replacement"'/g' -e 's/[*@|=]$//g' \
2122 + command gsed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$_escape_replacement"'/g' -e 's/[*@|=]$//g' \
2123 -e 's/[^\/]$/& /g')
2124 fi
2125 _comp_compgen -R split -l -- "$_files"
2126 @@ -549,13 +549,13 @@ _comp_xfunc_scp_compgen_local_files()
2127 if [[ $_dirsonly ]]; then
2128 _comp_compgen -U files split -l -- "$(
2129 command ls -aF1dL "${files[@]}" 2>/dev/null |
2130 - command sed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
2131 + command gsed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
2132 -e '/[^\/]$/d' -e "s/^/${1-}/"
2133 )"
2134 else
2135 _comp_compgen -U files split -l -- "$(
2136 command ls -aF1dL "${files[@]}" 2>/dev/null |
2137 - command sed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
2138 + command gsed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
2139 -e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' -e "s/^/${1-}/"
2140 )"
2141 fi
2142 diff -pruN bash-completion-2.15.0.old/completions/strings bash-completion-2.15.0/completions/strings
2143 --- bash-completion-2.15.0.old/completions/strings 2024-11-24 23:21:02.000000000 +0100
2144 +++ bash-completion-2.15.0/completions/strings 2024-11-30 21:20:51.861535991 +0100
2145 @@ -18,12 +18,12 @@ _comp_cmd_strings()
2146 ;;
2147 --target | -${noargopts}T)
2148 _comp_compgen_split -- "$(LC_ALL=C "$1" --help 2>/dev/null |
2149 - command sed -ne 's/: supported targets: \(.*\)/\1/p')"
2150 + command gsed -ne 's/: supported targets: \(.*\)/\1/p')"
2151 return
2152 ;;
2153 --encoding | -${noargopts}e)
2154 _comp_compgen_split -F , -- "$(LC_ALL=C "$1" --help 2>/dev/null |
2155 - command sed -ne 's/.*--encoding={\([^}]*\)}.*/\1/p')"
2156 + command gsed -ne 's/.*--encoding={\([^}]*\)}.*/\1/p')"
2157 return
2158 ;;
2159 esac
2160 @@ -34,7 +34,7 @@ _comp_cmd_strings()
2161 # macOS: ... [-t format] [-number] [-n number] ...
2162 _comp_compgen_help ||
2163 _comp_compgen_usage - <<<"$("$1" --help 2>&1 |
2164 - command sed -e "s/\[-number\]//")"
2165 + command gsed -e "s/\[-number\]//")"
2166 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
2167 return
2168 elif [[ $cur == @* ]]; then
2169 diff -pruN bash-completion-2.15.0.old/completions/svcadm bash-completion-2.15.0/completions/svcadm
2170 --- bash-completion-2.15.0.old/completions/svcadm 2020-01-11 19:58:32.000000000 +0100
2171 +++ bash-completion-2.15.0/completions/svcadm 2024-11-30 21:20:52.409870879 +0100
2172 @@ -25,7 +25,7 @@
2173 _gen_zoneadm_list()
2174 {
2175 if [[ ${prev} =~ "-z" ]]; then
2176 - local zones="$(zoneadm list -c | grep -v '^global$')"
2177 + local zones="$(zoneadm list -c | ggrep -v '^global$')"
2178 COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
2179 fi
2180 }
2181 @@ -133,7 +133,7 @@ _svcadm()
2182 else
2183 # svcadm [-v] milestone [-d] milestone_FMRI
2184 if [[ ${line} =~ -S ]]; then
2185 - command_list="$(echo ${command_list} | sed -e 's/milestone//')"
2186 + command_list="$(echo ${command_list} | gsed -e 's/milestone//')"
2187 fi
2188 COMPREPLY=( $(compgen -W "${command_list}" -- ${cur}) )
2189 fi
2190 diff -pruN bash-completion-2.15.0.old/completions/svk bash-completion-2.15.0/completions/svk
2191 --- bash-completion-2.15.0.old/completions/svk 2024-11-24 23:21:02.000000000 +0100
2192 +++ bash-completion-2.15.0/completions/svk 2024-11-30 21:20:52.031861575 +0100
2193 @@ -198,7 +198,7 @@ _comp_cmd_svk()
2194 path=//
2195 fi
2196 _comp_compgen_split -- "$("$1" list "$path" 2>/dev/null |
2197 - command sed -e 's|\(.*\)|'"$path"'\1|')"
2198 + command gsed -e 's|\(.*\)|'"$path"'\1|')"
2199 ;;
2200 *)
2201 _comp_compgen_filedir
2202 diff -pruN bash-completion-2.15.0.old/completions/sysbench bash-completion-2.15.0/completions/sysbench
2203 --- bash-completion-2.15.0.old/completions/sysbench 2024-11-24 23:21:02.000000000 +0100
2204 +++ bash-completion-2.15.0/completions/sysbench 2024-11-30 21:20:52.136718972 +0100
2205 @@ -75,7 +75,7 @@ _comp_cmd_sysbench()
2206 ;;
2207 --db-driver)
2208 _comp_compgen_split -- "$("$1" --test=oltp help 2>/dev/null |
2209 - command sed -e '/^.*database drivers:/,/^$/!d' \
2210 + command gsed -e '/^.*database drivers:/,/^$/!d' \
2211 -ne 's/^ *\([^ ]*\) .*/\1/p')"
2212 return
2213 ;;
2214 diff -pruN bash-completion-2.15.0.old/completions/tox bash-completion-2.15.0/completions/tox
2215 --- bash-completion-2.15.0.old/completions/tox 2024-11-24 23:21:02.000000000 +0100
2216 +++ bash-completion-2.15.0/completions/tox 2024-11-30 21:20:52.228007757 +0100
2217 @@ -33,7 +33,7 @@ _comp_cmd_tox()
2218 } 2>/dev/null
2219 )
2220 [[ $envs ]] || envs=$(
2221 - command sed -e 's/,/ /g' -ne 's/^envlist[[:space:]]*=//p' \
2222 + command gsed -e 's/,/ /g' -ne 's/^envlist[[:space:]]*=//p' \
2223 tox.ini 2>/dev/null
2224 )
2225 _comp_delimited , -X '*[{}]*' -W "$envs ALL"
2226 diff -pruN bash-completion-2.15.0.old/completions/tshark bash-completion-2.15.0/completions/tshark
2227 --- bash-completion-2.15.0.old/completions/tshark 2024-11-24 23:21:02.000000000 +0100
2228 +++ bash-completion-2.15.0/completions/tshark 2024-11-30 21:20:52.430715679 +0100
2229 @@ -23,7 +23,7 @@ _comp_cmd_tshark()
2230 _comp_compgen -c "${cur#*:}" filedir
2231 else
2232 [[ -v _comp_cmd_tshark__prefs ]] ||
2233 - _comp_cmd_tshark__prefs="$("$1" -G defaultprefs 2>/dev/null | command sed -ne 's/^#\{0,1\}\([a-z0-9_.-]\{1,\}:\).*/\1/p' |
2234 + _comp_cmd_tshark__prefs="$("$1" -G defaultprefs 2>/dev/null | command gsed -ne 's/^#\{0,1\}\([a-z0-9_.-]\{1,\}:\).*/\1/p' |
2235 tr '\n' ' ')"
2236 : ${prefix:=}
2237 _comp_compgen -c "${cur:${#prefix}}" -- -P "$prefix" \
2238 diff -pruN bash-completion-2.15.0.old/completions/update-alternatives bash-completion-2.15.0/completions/update-alternatives
2239 --- bash-completion-2.15.0.old/completions/update-alternatives 2024-11-24 23:21:02.000000000 +0100
2240 +++ bash-completion-2.15.0/completions/update-alternatives 2024-11-30 21:20:52.162634073 +0100
2241 @@ -83,7 +83,7 @@ _comp_cmd_update_alternatives()
2242 _comp_cmd_update_alternatives__installed
2243 ;;
2244 *)
2245 - _comp_compgen_help - <<<"$(LANG=C "$1" --help 2>&1 | command sed '
2246 + _comp_compgen_help - <<<"$(LANG=C "$1" --help 2>&1 | command gsed '
2247 /usage:/,/^[[:space:]]*$/{
2248 s/^\([[:space:]]*usage:\)\{0,1\}[[:space:]]*[^[:space:]]*alternatives / /
2249 s/^[[:space:]]*\[\(-.*\)\]/ \1/
2250 diff -pruN bash-completion-2.15.0.old/completions/valgrind bash-completion-2.15.0/completions/valgrind
2251 --- bash-completion-2.15.0.old/completions/valgrind 2024-11-24 23:21:02.000000000 +0100
2252 +++ bash-completion-2.15.0/completions/valgrind 2024-11-30 21:20:51.974933031 +0100
2253 @@ -72,7 +72,7 @@ _comp_cmd_valgrind()
2254 --+([-A-Za-z0-9_]))
2255 # shellcheck disable=SC2086
2256 local value=$("$1" --help-debug $tool 2>/dev/null |
2257 - command sed \
2258 + command gsed \
2259 -ne "s|^[[:blank:]]*$prev=\([^[:blank:]]\{1,\}\).*|\1|p")
2260 case $value in
2261 \<file*\>)
2262 diff -pruN bash-completion-2.15.0.old/completions/wget bash-completion-2.15.0/completions/wget
2263 --- bash-completion-2.15.0.old/completions/wget 2024-11-24 23:21:02.000000000 +0100
2264 +++ bash-completion-2.15.0/completions/wget 2024-11-30 21:20:52.272728505 +0100
2265 @@ -123,7 +123,7 @@ _comp_cmd_wget()
2266 return
2267 ;;
2268 --user | --http-user | --proxy-user | --ftp-user)
2269 - _comp_compgen_split -- "$(command sed -n \
2270 + _comp_compgen_split -- "$(command gsed -n \
2271 '/^login/s/^[[:blank:]]*login[[:blank:]]//p' ~/.netrc \
2272 2>/dev/null)"
2273 return
2274 diff -pruN bash-completion-2.15.0.old/completions/wol bash-completion-2.15.0/completions/wol
2275 --- bash-completion-2.15.0.old/completions/wol 2024-11-24 23:21:02.000000000 +0100
2276 +++ bash-completion-2.15.0/completions/wol 2024-11-30 21:20:52.401762467 +0100
2277 @@ -17,7 +17,7 @@ _comp_cmd_wol()
2278 _comp_compgen_split -- "$({
2279 ip -c=never addr show || ip addr show || ifconfig -a
2280 } 2>/dev/null |
2281 - command sed \
2282 + command gsed \
2283 -ne 's/.*[[:space:]]Bcast:\([^[:space:]]*\).*/\1/p' \
2284 -ne 's/.*inet.*[[:space:]]brd[[:space:]]\([^[:space:]]*\).*/\1/p' \
2285 -ne 's/.*[[:space:]]broadcast[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p')"
2286 diff -pruN bash-completion-2.15.0.old/completions/wvdial bash-completion-2.15.0/completions/wvdial
2287 --- bash-completion-2.15.0.old/completions/wvdial 2024-11-24 23:21:02.000000000 +0100
2288 +++ bash-completion-2.15.0/completions/wvdial 2024-11-30 21:20:52.440329030 +0100
2289 @@ -33,7 +33,7 @@ _comp_cmd_wvdial()
2290 done
2291 # parse config files for sections and
2292 # remove default section
2293 - _comp_compgen_split -l -X 'Defaults' -- "$(command sed -ne \
2294 + _comp_compgen_split -l -X 'Defaults' -- "$(command gsed -ne \
2295 's/^\[Dialer \(.*\)\]$/\1/p' "$config" 2>/dev/null)"
2296 # escape spaces
2297 COMPREPLY=("${COMPREPLY[@]// /\\ }")
2298 diff -pruN bash-completion-2.15.0.old/completions/xgamma bash-completion-2.15.0/completions/xgamma
2299 --- bash-completion-2.15.0.old/completions/xgamma 2024-11-24 23:21:02.000000000 +0100
2300 +++ bash-completion-2.15.0/completions/xgamma 2024-11-30 21:20:52.407349233 +0100
2301 @@ -7,7 +7,7 @@ _comp_cmd_xgamma()
2302
2303 case "$prev" in
2304 -screen)
2305 - local screens=$(xrandr --query 2>/dev/null | command sed -n \
2306 + local screens=$(xrandr --query 2>/dev/null | command gsed -n \
2307 '/^Screen /s|^Screen \{1,\}\(.*\):.*$|\1|p' 2>/dev/null)
2308 _comp_compgen -- -W "$screens"
2309 return
2310 @@ -30,7 +30,7 @@ _comp_cmd_xgamma()
2311 compopt -o nospace
2312 elif [[ $cur == :*.* ]]; then
2313 # local screen numbers
2314 - local t screens=$(xrandr --query 2>/dev/null | command sed -ne \
2315 + local t screens=$(xrandr --query 2>/dev/null | command gsed -ne \
2316 '/^Screen /s|^Screen \{1,\}\(.*\):.*$|\1|p' 2>/dev/null)
2317 t="${cur#:}"
2318 _comp_compgen -c "${cur##*.}" -- -P "${t%.*}." -W '$screens'
2319 diff -pruN bash-completion-2.15.0.old/completions/xrandr bash-completion-2.15.0/completions/xrandr
2320 --- bash-completion-2.15.0.old/completions/xrandr 2024-11-24 23:21:02.000000000 +0100
2321 +++ bash-completion-2.15.0/completions/xrandr 2024-11-30 21:20:52.293893464 +0100
2322 @@ -9,20 +9,20 @@ _comp_cmd_xrandr__compgen_monitors()
2323 {
2324 _comp_compgen_split -- "$(
2325 "$1" --listmonitors 2>/dev/null |
2326 - command sed -ne 's/.* [0-9]*: [+\*]*\([^ ]*\).*/\1/p'
2327 + command gsed -ne 's/.* [0-9]*: [+\*]*\([^ ]*\).*/\1/p'
2328 )"
2329 }
2330
2331 _comp_cmd_xrandr__compgen_providers()
2332 {
2333 _comp_compgen_split -- "$("$1" --listproviders 2>/dev/null |
2334 - command sed -ne "s/.*cap:.*$2.* name:\([^ ]*\).*/\1/p")"
2335 + command gsed -ne "s/.*cap:.*$2.* name:\([^ ]*\).*/\1/p")"
2336 }
2337
2338 _comp_cmd_xrandr__compgen_modes()
2339 {
2340 _comp_compgen_split -- "$(
2341 - "$1" -q 2>/dev/null | command sed \
2342 + "$1" -q 2>/dev/null | command gsed \
2343 -e "1,/^$2 / d" \
2344 -e '/connected/,$ d' \
2345 -e '/^[[:space:]]*h: / d' \
2346 @@ -34,7 +34,7 @@ _comp_cmd_xrandr__compgen_modes()
2347 _comp_cmd_xrandr__compgen_all_modes()
2348 {
2349 _comp_compgen_split -- "$(
2350 - "$1" -q 2>/dev/null | command sed \
2351 + "$1" -q 2>/dev/null | command gsed \
2352 -e '/^[^[:space:]].*/ d' \
2353 -e '/^[[:space:]]*h: / d' \
2354 -e '/^[[:space:]]*v: / d' \
2355 @@ -161,13 +161,13 @@ _comp_cmd_xrandr()
2356 if [[ $has_output ]]; then
2357 _comp_compgen -v options help - <<<"$(
2358 "$1" --help 2>/dev/null |
2359 - command sed -e 's/ or /\n /g' -e 's/<[^>]*>]//g'
2360 + command gsed -e 's/ or /\n /g' -e 's/<[^>]*>]//g'
2361 )"
2362 else
2363 # if no output is specified, remove per-output options
2364 _comp_compgen -v options help - <<<"$(
2365 "$1" --help 2>/dev/null |
2366 - command sed -e '/^ -/!d' -e 's/ or /\n /g' -e 's/<[^>]*>]//g'
2367 + command gsed -e '/^ -/!d' -e 's/ or /\n /g' -e 's/<[^>]*>]//g'
2368 )"
2369 fi
2370
2371 diff -pruN bash-completion-2.15.0.old/completions/xsltproc bash-completion-2.15.0/completions/xsltproc
2372 --- bash-completion-2.15.0.old/completions/xsltproc 2024-11-24 23:21:02.000000000 +0100
2373 +++ bash-completion-2.15.0/completions/xsltproc 2024-11-30 21:20:52.368536251 +0100
2374 @@ -16,7 +16,7 @@ _comp_cmd_xsltproc()
2375 ;;
2376 --encoding)
2377 # some aliases removed
2378 - local encodings=$(iconv -l | command sed -e 's/\/.*//')
2379 + local encodings=$(iconv -l | command gsed -e 's/\/.*//')
2380 _comp_compgen -- -X '@(UTF[1378]|8859|ISO[0-9_])*' -W '$encodings'
2381 return
2382 ;;
2383 diff -pruN bash-completion-2.15.0.old/completions/zfs bash-completion-2.15.0/completions/zfs
2384 --- bash-completion-2.15.0.old/completions/zfs 2020-01-11 19:58:32.000000000 +0100
2385 +++ bash-completion-2.15.0/completions/zfs 2024-11-30 21:20:52.262348616 +0100
2386 @@ -141,7 +141,7 @@ __zfs_match_multiple_snapshots()
2387 return 1
2388 fi
2389 local range_start=$(expr "$cur" : '\(.*%\)')
2390 - $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g'
2391 + $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset | gsed 's$.*@$'$range_start'$g'
2392 fi
2393 else
2394 __zfs_match_snapshot_or_bookmark
2395 diff -pruN bash-completion-2.15.0.old/completions/zones bash-completion-2.15.0/completions/zones
2396 --- bash-completion-2.15.0.old/completions/zones 2020-01-11 19:58:32.000000000 +0100
2397 +++ bash-completion-2.15.0/completions/zones 2024-11-30 21:20:52.411027650 +0100
2398 @@ -31,7 +31,7 @@ _zlogin()
2399 esac
2400 else
2401 # Provide running zone names
2402 - local zones=$(zoneadm list | grep -v '^global$')
2403 + local zones=$(zoneadm list | ggrep -v '^global$')
2404 COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
2405 fi
2406 }
2407 @@ -45,7 +45,7 @@ _dash_z_zone()
2408
2409 if [[ ${prev} =~ "-z" ]]; then
2410 # Provide running zone names
2411 - local zones="$(zoneadm list -c | grep -v '^global$')"
2412 + local zones="$(zoneadm list -c | ggrep -v '^global$')"
2413 COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
2414 fi
2415 }