Skip to content

Commit 8372459

Browse files
committed
style: call awk through _comp_awk
To avoid caring about the limited feature set of Solaris awk compared to POSIX awk, we always use `_comp_awk` from now on.
1 parent 63dbf2b commit 8372459

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+133
-130
lines changed

bash_completion

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ _comp_compgen_available_interfaces()
17021702
else
17031703
ifconfig -a || ip -c=never link show || ip link show
17041704
fi
1705-
} 2>/dev/null | awk \
1705+
} 2>/dev/null | _comp_awk \
17061706
'/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }')" &&
17071707
_comp_compgen -U generated set "${generated[@]}"
17081708
}
@@ -1943,7 +1943,7 @@ _comp_compgen_services()
19431943
systemctl list-units --full --all ||
19441944
systemctl list-unit-files
19451945
} 2>/dev/null |
1946-
awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }')
1946+
_comp_awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }')
19471947
_comp_split -la services "$_generated"
19481948

19491949
if [[ -x /sbin/upstart-udev-bridge ]]; then
@@ -2016,7 +2016,7 @@ _comp_compgen_kernel_modules()
20162016
_comp_compgen_inserted_kernel_modules()
20172017
{
20182018
_comp_compgen -c "${1:-$cur}" split -- "$(PATH="$PATH:/sbin" lsmod |
2019-
awk '{if (NR != 1) print $1}')"
2019+
_comp_awk '{if (NR != 1) print $1}')"
20202020
}
20212021

20222022
# This function completes on user or user:group format; as for chown and cpio.
@@ -2097,7 +2097,7 @@ _comp_compgen_allowed_groups()
20972097
_comp_compgen_selinux_users()
20982098
{
20992099
_comp_compgen_split -- "$(semanage user -nl 2>/dev/null |
2100-
awk '{ print $1 }')"
2100+
_comp_awk '{ print $1 }')"
21012101
}
21022102

21032103
# This function completes on valid shells
@@ -2124,14 +2124,14 @@ _comp_compgen_fstypes()
21242124
if [[ -e /proc/filesystems ]]; then
21252125
# Linux
21262126
_fss="$(cut -d$'\t' -f2 /proc/filesystems)
2127-
$(awk '! /\*/ { print $NF }' /etc/filesystems 2>/dev/null)"
2127+
$(_comp_awk '! /\*/ { print $NF }' /etc/filesystems 2>/dev/null)"
21282128
else
21292129
# Generic
2130-
_fss="$(awk '/^[ \t]*[^#]/ { print $3 }' /etc/fstab 2>/dev/null)
2131-
$(awk '/^[ \t]*[^#]/ { print $3 }' /etc/mnttab 2>/dev/null)
2132-
$(awk '/^[ \t]*[^#]/ { print $4 }' /etc/vfstab 2>/dev/null)
2133-
$(awk '{ print $1 }' /etc/dfs/fstypes 2>/dev/null)
2134-
$(lsvfs 2>/dev/null | awk '$1 !~ /^(Filesystem|[^a-zA-Z])/ { print $1 }')
2130+
_fss="$(_comp_awk '/^[ \t]*[^#]/ { print $3 }' /etc/fstab 2>/dev/null)
2131+
$(_comp_awk '/^[ \t]*[^#]/ { print $3 }' /etc/mnttab 2>/dev/null)
2132+
$(_comp_awk '/^[ \t]*[^#]/ { print $4 }' /etc/vfstab 2>/dev/null)
2133+
$(_comp_awk '{ print $1 }' /etc/dfs/fstypes 2>/dev/null)
2134+
$(lsvfs 2>/dev/null | _comp_awk '$1 !~ /^(Filesystem|[^a-zA-Z])/ { print $1 }')
21352135
$([[ -d /etc/fs ]] && command ls /etc/fs)"
21362136
fi
21372137

@@ -2289,15 +2289,15 @@ _comp_count_args()
22892289
# @since 2.12
22902290
_comp_compgen_pci_ids()
22912291
{
2292-
_comp_compgen_split -- "$(PATH="$PATH:/sbin" lspci -n | awk '{print $3}')"
2292+
_comp_compgen_split -- "$(PATH="$PATH:/sbin" lspci -n | _comp_awk '{print $3}')"
22932293
}
22942294

22952295
# This function completes on USB IDs
22962296
#
22972297
# @since 2.12
22982298
_comp_compgen_usb_ids()
22992299
{
2300-
_comp_compgen_split -- "$(PATH="$PATH:/sbin" lsusb | awk '{print $6}')"
2300+
_comp_compgen_split -- "$(PATH="$PATH:/sbin" lsusb | _comp_awk '{print $6}')"
23012301
}
23022302

23032303
# CD device names
@@ -2325,11 +2325,11 @@ _comp_compgen_terms()
23252325
command sed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap
23262326
{
23272327
toe -a || toe
2328-
} | awk '{ print $1 }'
2328+
} | _comp_awk '{ print $1 }'
23292329
_comp_expand_glob dirs '/{etc,lib,usr/lib,usr/share}/terminfo/?'
23302330
((${#dirs[@]})) &&
23312331
find "${dirs[@]}" -type f -maxdepth 1 |
2332-
awk -F/ '{ print $NF }'
2332+
_comp_awk -F/ '{ print $NF }'
23332333
} 2>/dev/null)"
23342334
}
23352335

@@ -2533,7 +2533,7 @@ _comp_compgen_known_hosts__impl()
25332533
# TODO(?): try to make known hosts files with more than one consecutive
25342534
# spaces in their name work (watch out for ~ expansion
25352535
# breakage! Alioth#311595)
2536-
if _comp_split -l tmpkh "$(awk 'sub("^[ \t]*([Gg][Ll][Oo][Bb][Aa][Ll]|[Uu][Ss][Ee][Rr])[Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][ \t=]+", "") { print $0 }' "${config[@]}" | sort -u)"; then
2536+
if _comp_split -l tmpkh "$(_comp_awk 'sub("^[ \t]*([Gg][Ll][Oo][Bb][Aa][Ll]|[Uu][Ss][Ee][Rr])[Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][ \t=]+", "") { print $0 }' "${config[@]}" | sort -u)"; then
25372537
local tmpkh2 j ret
25382538
for i in "${tmpkh[@]}"; do
25392539
# First deal with quoted entries...
@@ -2628,15 +2628,15 @@ _comp_compgen_known_hosts__impl()
26282628
type avahi-browse &>/dev/null; then
26292629
# Some old versions of avahi-browse reportedly didn't have -k
26302630
# (even if mentioned in the manpage); those we do not support any more.
2631-
local generated=$(avahi-browse -cprak 2>/dev/null | awk -F';' \
2631+
local generated=$(avahi-browse -cprak 2>/dev/null | _comp_awk -F';' \
26322632
'/^=/ && $5 ~ /^_(ssh|workstation)\._tcp$/ { print $7 }' |
26332633
sort -u)
26342634
_comp_compgen -av known_hosts -- -P "$prefix" -S "$suffix" -W '$generated'
26352635
fi
26362636

26372637
# Add hosts reported by ruptime.
26382638
if type ruptime &>/dev/null; then
2639-
local generated=$(ruptime 2>/dev/null | awk '!/^ruptime:/ { print $1 }')
2639+
local generated=$(ruptime 2>/dev/null | _comp_awk '!/^ruptime:/ { print $1 }')
26402640
_comp_compgen -av known_hosts -- -W '$generated'
26412641
fi
26422642

completions/_adb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _comp_cmd_adb()
3939
_comp_compgen -av tmp help -- help
4040
fi
4141
if [[ ! $cur || $cur != -* ]]; then
42-
tmp+=($("$1" help 2>&1 | awk '$1 == "adb" { print $2 }'))
42+
tmp+=($("$1" help 2>&1 | _comp_awk '$1 == "adb" { print $2 }'))
4343
tmp+=(devices connect disconnect sideload)
4444
fi
4545
((${#tmp[@]})) &&

completions/_modules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ _comp_cmd_module()
5454

5555
local options
5656
options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' |
57-
awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
57+
_comp_awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
5858

5959
_comp_compgen -- -W "$options"
6060

completions/_mount

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ _comp_cmd_mount()
3434
for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
3535
[[ -x $sm ]] || continue
3636
_comp_compgen -c "${cur#*:}" split -- "$(
37-
"$sm" -e ${cur%%:*} | awk 'NR>1 {print $1}'
37+
"$sm" -e ${cur%%:*} | _comp_awk 'NR>1 {print $1}'
3838
)"
3939
return
4040
done
@@ -53,17 +53,17 @@ _comp_cmd_mount()
5353
elif [[ -r /etc/vfstab ]]; then
5454
# Solaris
5555
_comp_compgen_split -- "$(
56-
awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab
56+
_comp_awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab
5757
)"
5858
elif [[ ! -e /etc/fstab ]]; then
5959
# probably Cygwin
6060
_comp_compgen_split -- "$(
61-
"$1" | awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}'
61+
"$1" | _comp_awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}'
6262
)"
6363
else
6464
# probably BSD
6565
_comp_compgen_split -- "$(
66-
awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab
66+
_comp_awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab
6767
)"
6868
fi
6969
} &&

completions/_mount.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ _comp_cmd_mount()
226226
for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
227227
[[ -x $sm ]] || continue
228228
_comp_compgen -c "${cur#*:}" split -- "$(
229-
"$sm" -e ${cur%%:*} | awk 'NR>1 {print $1}'
229+
"$sm" -e ${cur%%:*} | _comp_awk 'NR>1 {print $1}'
230230
)"
231231
return
232232
done

completions/_rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ _comp_cmd_rfkill()
1818
2)
1919
if [[ $prev == block || $prev == unblock ]]; then
2020
_comp_compgen_split -- "$("$1" list |
21-
awk -F: '/^[0-9]/ {print $1}') all wifi bluetooth uwb
21+
_comp_awk -F: '/^[0-9]/ {print $1}') all wifi bluetooth uwb
2222
wimax wwan gps"
2323
fi
2424
;;

completions/_udevadm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ _comp_cmd_udevadm()
5959
;;
6060
*)
6161
_comp_compgen_split -- "$("$1" --help 2>/dev/null |
62-
awk '/^[ \t]/ { print $1 }')"
62+
_comp_awk '/^[ \t]/ { print $1 }')"
6363
;;
6464
esac
6565
return

completions/_xm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
_comp_cmd_xm__domain_names()
88
{
99
_comp_compgen_split -- "$(xm list 2>/dev/null |
10-
awk '!/Name|Domain-0/ { print $1 }')"
10+
_comp_awk '!/Name|Domain-0/ { print $1 }')"
1111
}
1212

1313
_comp_cmd_xm()
@@ -147,7 +147,7 @@ _comp_cmd_xm()
147147
;;
148148
3)
149149
_comp_compgen_split -- "$(xm block-list "$prev" \
150-
2>/dev/null | awk '!/Vdev/ { print $1 }')"
150+
2>/dev/null | _comp_awk '!/Vdev/ { print $1 }')"
151151
;;
152152
esac
153153
;;
@@ -171,7 +171,7 @@ _comp_cmd_xm()
171171
;;
172172
3)
173173
_comp_compgen_split -- "$(xm network-list "$prev" \
174-
2>/dev/null | awk '!/Idx/ { print $1 }')"
174+
2>/dev/null | _comp_awk '!/Idx/ { print $1 }')"
175175
;;
176176
esac
177177
;;

completions/apache2ctl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ _comp_cmd_apache2ctl()
66
_comp_initialize -- "$@" || return
77

88
local APWORDS
9-
APWORDS=$("$1" 2>&1 >/dev/null | awk 'NR<2 { print $3; exit }' |
9+
APWORDS=$("$1" 2>&1 >/dev/null | _comp_awk 'NR<2 { print $3; exit }' |
1010
tr "|" " ")
1111

1212
_comp_compgen -- -W "$APWORDS"

completions/apt-cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _comp_xfunc_apt_cache_compgen_sources()
2626
_comp_cmd_apt_cache__compgen_sources()
2727
{
2828
_comp_compgen_split -- "$("$1" dumpavail |
29-
awk '$1 == "Source:" { print $2 }' | sort -u)"
29+
_comp_awk '$1 == "Source:" { print $2 }' | sort -u)"
3030
}
3131

3232
# List APT binary packages

0 commit comments

Comments
 (0)