Merge pull request #1072 from akinomyoga/command-awk

refactor: prefix `command` to the `awk` command

Author: scop

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     hooks:
       - id: shfmt
         types: [text]
-        files: ^(bash_completion(\.d/[^/]+\.bash)?|completions/.+|test/(config/bashrc|fallback/update-fallback-links|update-test-cmd-list)|.+\.sh(\.in)?)$
+        files: ^(bash_completion(\.d/[^/]+\.bash)?|completions/.+|test/(config/bashrc|fallback/update-fallback-links|runLint|update-test-cmd-list)|.+\.sh(\.in)?)$
         exclude: ^completions/(\.gitignore|Makefile.*)$
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
@@ -22,7 +22,7 @@ repos:
       - id: shellcheck
         args: [-f, gcc]
         types: [text]
-        files: ^(bash_completion(\.d/[^/]+\.bash)?|completions/.+|test/(config/bashrc|fallback/update-fallback-links|update-test-cmd-list)|.+\.sh(\.in)?)$
+        files: ^(bash_completion(\.d/[^/]+\.bash)?|completions/.+|test/(config/bashrc|fallback/update-fallback-links|runLint|update-test-cmd-list)|.+\.sh(\.in)?)$
         exclude: ^completions/(\.gitignore|Makefile.*)$
         require_serial: false  # We disable SC1090 anyway, so parallel is ok
 

bash_completion

@@ -1702,7 +1702,7 @@ _comp_compgen_available_interfaces()
         else
             ifconfig -a || ip -c=never link show || ip link show
         fi
-    } 2>/dev/null | awk \
+    } 2>/dev/null | _comp_awk \
         '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }')" &&
         _comp_compgen -U generated set "${generated[@]}"
 }
@@ -1943,7 +1943,7 @@ _comp_compgen_services()
         systemctl list-units --full --all ||
             systemctl list-unit-files
     } 2>/dev/null |
-        awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }')
+        _comp_awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }')
     _comp_split -la services "$_generated"
 
     if [[ -x /sbin/upstart-udev-bridge ]]; then
@@ -2016,7 +2016,7 @@ _comp_compgen_kernel_modules()
 _comp_compgen_inserted_kernel_modules()
 {
     _comp_compgen -c "${1:-$cur}" split -- "$(PATH="$PATH:/sbin" lsmod |
-        awk '{if (NR != 1) print $1}')"
+        _comp_awk '{if (NR != 1) print $1}')"
 }
 
 # This function completes on user or user:group format; as for chown and cpio.
@@ -2097,7 +2097,7 @@ _comp_compgen_allowed_groups()
 _comp_compgen_selinux_users()
 {
     _comp_compgen_split -- "$(semanage user -nl 2>/dev/null |
-        awk '{ print $1 }')"
+        _comp_awk '{ print $1 }')"
 }
 
 # This function completes on valid shells
@@ -2124,14 +2124,14 @@ _comp_compgen_fstypes()
     if [[ -e /proc/filesystems ]]; then
         # Linux
         _fss="$(cut -d$'\t' -f2 /proc/filesystems)
-             $(awk '! /\*/ { print $NF }' /etc/filesystems 2>/dev/null)"
+             $(_comp_awk '! /\*/ { print $NF }' /etc/filesystems 2>/dev/null)"
     else
         # Generic
-        _fss="$(awk '/^[ \t]*[^#]/ { print $3 }' /etc/fstab 2>/dev/null)
-             $(awk '/^[ \t]*[^#]/ { print $3 }' /etc/mnttab 2>/dev/null)
-             $(awk '/^[ \t]*[^#]/ { print $4 }' /etc/vfstab 2>/dev/null)
-             $(awk '{ print $1 }' /etc/dfs/fstypes 2>/dev/null)
-             $(lsvfs 2>/dev/null | awk '$1 !~ /^(Filesystem|[^a-zA-Z])/ { print $1 }')
+        _fss="$(_comp_awk '/^[ \t]*[^#]/ { print $3 }' /etc/fstab 2>/dev/null)
+             $(_comp_awk '/^[ \t]*[^#]/ { print $3 }' /etc/mnttab 2>/dev/null)
+             $(_comp_awk '/^[ \t]*[^#]/ { print $4 }' /etc/vfstab 2>/dev/null)
+             $(_comp_awk '{ print $1 }' /etc/dfs/fstypes 2>/dev/null)
+             $(lsvfs 2>/dev/null | _comp_awk '$1 !~ /^(Filesystem|[^a-zA-Z])/ { print $1 }')
              $([[ -d /etc/fs ]] && command ls /etc/fs)"
     fi
 
@@ -2289,15 +2289,15 @@ _comp_count_args()
 # @since 2.12
 _comp_compgen_pci_ids()
 {
-    _comp_compgen_split -- "$(PATH="$PATH:/sbin" lspci -n | awk '{print $3}')"
+    _comp_compgen_split -- "$(PATH="$PATH:/sbin" lspci -n | _comp_awk '{print $3}')"
 }
 
 # This function completes on USB IDs
 #
 # @since 2.12
 _comp_compgen_usb_ids()
 {
-    _comp_compgen_split -- "$(PATH="$PATH:/sbin" lsusb | awk '{print $6}')"
+    _comp_compgen_split -- "$(PATH="$PATH:/sbin" lsusb | _comp_awk '{print $6}')"
 }
 
 # CD device names
@@ -2325,11 +2325,11 @@ _comp_compgen_terms()
         command sed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap
         {
             toe -a || toe
-        } | awk '{ print $1 }'
+        } | _comp_awk '{ print $1 }'
         _comp_expand_glob dirs '/{etc,lib,usr/lib,usr/share}/terminfo/?'
         ((${#dirs[@]})) &&
             find "${dirs[@]}" -type f -maxdepth 1 |
-            awk -F/ '{ print $NF }'
+            _comp_awk -F / '{ print $NF }'
     } 2>/dev/null)"
 }
 
@@ -2533,7 +2533,7 @@ _comp_compgen_known_hosts__impl()
         # TODO(?): try to make known hosts files with more than one consecutive
         #          spaces in their name work (watch out for ~ expansion
         #          breakage! Alioth#311595)
-        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
+        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
             local tmpkh2 j ret
             for i in "${tmpkh[@]}"; do
                 # First deal with quoted entries...
@@ -2628,15 +2628,15 @@ _comp_compgen_known_hosts__impl()
         type avahi-browse &>/dev/null; then
         # Some old versions of avahi-browse reportedly didn't have -k
         # (even if mentioned in the manpage); those we do not support any more.
-        local generated=$(avahi-browse -cprak 2>/dev/null | awk -F';' \
+        local generated=$(avahi-browse -cprak 2>/dev/null | _comp_awk -F ';' \
             '/^=/ && $5 ~ /^_(ssh|workstation)\._tcp$/ { print $7 }' |
             sort -u)
         _comp_compgen -av known_hosts -- -P "$prefix" -S "$suffix" -W '$generated'
     fi
 
     # Add hosts reported by ruptime.
     if type ruptime &>/dev/null; then
-        local generated=$(ruptime 2>/dev/null | awk '!/^ruptime:/ { print $1 }')
+        local generated=$(ruptime 2>/dev/null | _comp_awk '!/^ruptime:/ { print $1 }')
         _comp_compgen -av known_hosts -- -W '$generated'
     fi
 

completions/_adb

@@ -39,7 +39,7 @@ _comp_cmd_adb()
             _comp_compgen -av tmp help -- help
         fi
         if [[ ! $cur || $cur != -* ]]; then
-            tmp+=($("$1" help 2>&1 | awk '$1 == "adb" { print $2 }'))
+            tmp+=($("$1" help 2>&1 | _comp_awk '$1 == "adb" { print $2 }'))
             tmp+=(devices connect disconnect sideload)
         fi
         ((${#tmp[@]})) &&

completions/_mock

@@ -40,12 +40,15 @@ _comp_cmd_mock()
             return
             ;;
         --target)
+            # Case-insensitive BRE to match "compatible archs"
+            local regex_header='[cC][oO][mM][pP][aA][tT][iI][bB][lL][eE][[:space:]]\{1,\}[aA][rR][cC][hH][sS]'
+
             # Yep, compatible archs, not compatible build archs
             # (e.g. ix86 chroot builds in x86_64 mock host)
             # This would actually depend on what the target root
             # can be used to build for...
             _comp_compgen_split -- "$(command rpm --showrc | command sed -ne \
-                's/^\s*compatible\s\s*archs\s*:\s*\(.*\)/\1/i p')"
+                "s/^[[:space:]]*${regex_header}[[:space:]]*:[[:space:]]*\(.*\)/\1/p")"
             return
             ;;
         --enable-plugin | --disable-plugin)

completions/_modules

@@ -54,7 +54,7 @@ _comp_cmd_module()
 
         local options
         options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' |
-            awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
+            _comp_awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
 
         _comp_compgen -- -W "$options"
 

completions/_mount

@@ -34,7 +34,7 @@ _comp_cmd_mount()
         for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
             [[ -x $sm ]] || continue
             _comp_compgen -c "${cur#*:}" split -- "$(
-                "$sm" -e ${cur%%:*} | awk 'NR>1 {print $1}'
+                "$sm" -e ${cur%%:*} | _comp_awk 'NR>1 {print $1}'
             )"
             return
         done
@@ -53,17 +53,17 @@ _comp_cmd_mount()
     elif [[ -r /etc/vfstab ]]; then
         # Solaris
         _comp_compgen_split -- "$(
-            awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab
+            _comp_awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab
         )"
     elif [[ ! -e /etc/fstab ]]; then
         # probably Cygwin
         _comp_compgen_split -- "$(
-            "$1" | awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}'
+            "$1" | _comp_awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}'
         )"
     else
         # probably BSD
         _comp_compgen_split -- "$(
-            awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab
+            _comp_awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab
         )"
     fi
 } &&

completions/_mount.linux

@@ -226,7 +226,7 @@ _comp_cmd_mount()
         for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
             [[ -x $sm ]] || continue
             _comp_compgen -c "${cur#*:}" split -- "$(
-                "$sm" -e ${cur%%:*} | awk 'NR>1 {print $1}'
+                "$sm" -e ${cur%%:*} | _comp_awk 'NR>1 {print $1}'
             )"
             return
         done

completions/_rfkill

@@ -17,9 +17,9 @@ _comp_cmd_rfkill()
                 ;;
             2)
                 if [[ $prev == block || $prev == unblock ]]; then
-                    _comp_compgen_split -- "$("$1" list |
-                        awk -F: '/^[0-9]/ {print $1}') all wifi bluetooth uwb
-                        wimax wwan gps"
+                    _comp_compgen_split -- "
+                        $("$1" list | _comp_awk -F : '/^[0-9]/ {print $1}')
+                        all wifi bluetooth uwb wimax wwan gps"
                 fi
                 ;;
         esac

completions/_udevadm

@@ -59,7 +59,7 @@ _comp_cmd_udevadm()
                 ;;
             *)
                 _comp_compgen_split -- "$("$1" --help 2>/dev/null |
-                    awk '/^[ \t]/ { print $1 }')"
+                    _comp_awk '/^[ \t]/ { print $1 }')"
                 ;;
         esac
         return

completions/_xm

@@ -7,7 +7,7 @@
 _comp_cmd_xm__domain_names()
 {
     _comp_compgen_split -- "$(xm list 2>/dev/null |
-        awk '!/Name|Domain-0/ { print $1 }')"
+        _comp_awk '!/Name|Domain-0/ { print $1 }')"
 }
 
 _comp_cmd_xm()
@@ -147,7 +147,7 @@ _comp_cmd_xm()
                             ;;
                         3)
                             _comp_compgen_split -- "$(xm block-list "$prev" \
-                                2>/dev/null | awk '!/Vdev/ { print $1 }')"
+                                2>/dev/null | _comp_awk '!/Vdev/ { print $1 }')"
                             ;;
                     esac
                     ;;
@@ -171,7 +171,7 @@ _comp_cmd_xm()
                             ;;
                         3)
                             _comp_compgen_split -- "$(xm network-list "$prev" \
-                                2>/dev/null | awk '!/Idx/ { print $1 }')"
+                                2>/dev/null | _comp_awk '!/Idx/ { print $1 }')"
                             ;;
                     esac
                     ;;