Re: PATCH: completion options update

[Oliver Kiddle <opk@xxxxxxx>]

Mikael Magnusson wrote:
> These three seem to already be listed a few lines above the context.

Thanks for the review and for finding the silly mistakes. An extra patch
follows with the fixes. I checked over the Debian stuff again - the
duplicates had got in due to merges. I've also had much of the _nmap
changes around in half-finished form long enough that they underwent
merges. The exclusion of table options in _column for -S was actually
correct despite looking out-of-place relative to the rest of the group.

Oliver

diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
index 2b3303eb6..01d8282d1 100644
--- a/Completion/Debian/Command/_apt
+++ b/Completion/Debian/Command/_apt
@@ -522,9 +522,6 @@ _apt-get () {
     --no-upgrade:bool \
     --only-source:bool \
     --only-upgrade:bool \
-    --allow-downgrades:bool \
-    --allow-remove-essential:bool \
-    --allow-change-held-packages:bool \
     --print-uris:bool \
     --purge:bool \
     --reinstall:bool \
diff --git a/Completion/Debian/Command/_dpkg_source b/Completion/Debian/Command/_dpkg_source
index e2af0a57b..379ad39a7 100644
--- a/Completion/Debian/Command/_dpkg_source
+++ b/Completion/Debian/Command/_dpkg_source
@@ -16,7 +16,8 @@ _arguments \
   '-D-[override dsc field]:expression:' \
   '-U-[remove a field]:field:' \
   '(-i --diff-ignore)'{-i-,--diff-ignore=}'[filter out files to ignore diffs of]:regex' \
-  '(-I --tar-ignore)'{-i-,--tar-ignore=}'[filter out files when building tarballs]:regex' \
+  '--extend-diff-ignore=:regex' \
+  '(-I --tar-ignore)'{-I-,--tar-ignore=}'[filter out files when building tarballs]:regex' \
   '(-Z --compression)'{-Z-,--compression=}'[select compression to use]:compression [xz]:(bzip2 gzip lzma xz)' \
   '(-z --compression-level)'{-z-,--compression-level=}'[compression level to use]:level [9]' \
   "--no-copy[don't copy .orig tarballs]" \
@@ -25,6 +26,7 @@ _arguments \
   "--require-valid-signature[abort if the package doesn't have a valid signature]" \
   '--require-strong-checksums[abort if the package contains no strong checksums]' \
   '--ignore-bad-version[allow bad source package versions]' \
+  '--threads-max=[set maximum number of threads for compressors]:threads' \
   '-sa[autoselect orig source]' \
   '-sk[use packaged orig source - unpack and keep]' \
   '-sp[use packaged orig source - unpack and remove]' \
@@ -33,6 +35,7 @@ _arguments \
   '-ss[trust packed and unpacked source are the same]' \
   '-sn[no diff, do main tarfile only]' \
   '-sA[autoselect orig source with overwrite]' \
+  '--abort-on-upstream-changes' \
   '-sK[use packaged orig source - unpack and keep with overwrite]' \
   '-sP[use packaged orig source - unpack and remove with overwrite]' \
   '-sU[use unpackaged orig source - unpack and keep with overwrite]' \
diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool
index 2213a5d06..f1f67a357 100644
--- a/Completion/Linux/Command/_ethtool
+++ b/Completion/Linux/Command/_ethtool
@@ -9,7 +9,7 @@ _arguments -C -A "-*" \
   '(-j --json)'{-j,--json}'[output results in JSON]' \
   '(-I --include-statistics)'{-I,--include-statistics}'[include command-related statistics in the output]' \
   '(cmds cmdp)'{-Q,--per-queue}'[apply per-queue command]: :(queue_mask):queue mask' \
-  '(cmds cmdc)--phy=[target a PHY within the interface.]:phy' \
+  '(cmds cmdc)--phy=[target a PHY within the interface]:phy' \
   "1:interface:_net_interfaces" \
   '*:: :->args' \
   + '(cmdc)' \
diff --git a/Completion/Unix/Command/_cat b/Completion/Unix/Command/_cat
index f71d77e2e..d15c5f93c 100644
--- a/Completion/Unix/Command/_cat
+++ b/Completion/Unix/Command/_cat
@@ -35,7 +35,6 @@ else
       args+=(
         '-s[squeeze multiple blank lines into one]'
         '(-v)-t[display tab as ^I (implies -v)]'
-        '-v[display non-printing chars as ^X or M-a]'
       )
     ;|
     (free|net)bsd*)
diff --git a/Completion/Unix/Command/_column b/Completion/Unix/Command/_column
index aa3a3664a..d9f397f23 100644
--- a/Completion/Unix/Command/_column
+++ b/Completion/Unix/Command/_column
@@ -32,7 +32,7 @@ case $variant in
       + fill
       '(info table text json -x --fillrows)'{-x,--fillrows}'[print across before down]'
       + table
-      '(info fill -t --table)'{-t,--table}'[create a table]'
+      '(info fill -t --table -S --use-spaces)'{-t,--table}'[create a table]'
       '(info fill -o --output-separator)'{-o+,--output-separator=}'[specify column separator for table output]:separator [two spaces]'
       '(info fill -s --input-separator --separator)'{-s+,--input-separator=,--separator=}'[specify column delimiters in input data]:delimiters'
       '(info fill -O --table-order)'{-O+,--table-order=}'[specify order of output columns]: :->columns'
diff --git a/Completion/Unix/Command/_nmap b/Completion/Unix/Command/_nmap
index 148b77b51..4325a5317 100644
--- a/Completion/Unix/Command/_nmap
+++ b/Completion/Unix/Command/_nmap
@@ -14,7 +14,7 @@ _arguments -s -S -C \
   '!(-F -p --exclude-ports)-sn' \
   '-iL[read target specifications from file]:file:_files' \
   '-iR[scan random hosts]:num hosts' \
-  '--exclude[specify hosts/networks to exclude]:host list:_sequence -s, _hosts' \
+  '--exclude[specify hosts/networks to exclude]:host list:_sequence _hosts' \
   '--excludefile[use exclude list from a file]:file:_files' \
   '*-s-[specify scan type]:scan type:((S\:TCP\ SYN\ scan T\:TCP\ connect\(\)\ scan F\:stealth\ FIN\ scan X\:stealth\ Xmas\ tree\ scan N\:stealth\ null\ scan P\:ping\ scanning U\:UDP\ scan O\:IP\ protocol\ scan I\:idle\ scan A\:TCP\ ACK\ scan W\:TCP\ window\ scan M\:TCP\ Maimon\ scan R\:RPC\ scan L\:list\ scan Y\:SCTP\ INIT\ scan Z\:SCTP\ COOKIE-ECHO\ scan V\:version\ detection n\:no\ port\ scan C\:equivalent\ to\ --script=default))' \
   '*-P-[specify probe types and options]:probe type/options:->probe-opts' \
@@ -23,7 +23,7 @@ _arguments -s -S -C \
   '--resolve-all[scan all addresses resolved via DNS]' \
   '--unique[scan each address only once]' \
   '(--dns-servers -n)--system-dns[use OS DNS resolver for reverse lookups]' \
-  '(--system-dns -n)--dns-servers[specify custom DNS servers for reverse lookups]:server:_sequence s, _hosts' \
+  '(--system-dns -n)--dns-servers[specify custom DNS servers for reverse lookups]:server:_sequence _hosts' \
   "--disable-arp-ping[don't do ARP or IPv6 ND of locally connected ethernet hosts]" \
   "--discovery-ignore-rst[don't treat RST replies as proof of a target being up]" \
   '--traceroute[trace hop path to each host]' \
@@ -65,7 +65,7 @@ _arguments -s -S -C \
   '-T[set a timing template]:timing policy:(paranoid sneaky polite normal aggressive insane)' \
   '-f[fragment packets]' \
   '--mtu=[specify MTU, with -f]:mtu' \
-  '-D[perform decoy scan]:host list:_sequence -s, _hosts' \
+  '-D[perform decoy scan]:host list:_sequence _hosts' \
   '-S[spoof source address]:address:_hosts' \
   '-e[specify interface to use]:network interface:_net_interfaces' \
   '(-g --source-port)'{-g,--source-port=}'[specify source port number]:port number' \
@@ -76,7 +76,7 @@ _arguments -s -S -C \
   '--ttl[specify IPv4 time to live for sent packets]:time-to-live' \
   '--randomize-hosts[scan hosts in random order]' \
   '--spoof-mac=[spoof your MAC address]:MAC address' \
-  '--proxies=[relay connections through HTTP/SOCKS4 proxies]:proxy;_sequence _urls' \
+  '--proxies=[relay connections through HTTP/SOCKS4 proxies]:proxy:_sequence _urls' \
   '--badsum[send packets with a bogus TCP/UDP/SCTP checksum]' \
   '--adler32[use deprecated Adler32 instead of CRC32C for SCTP checksums]' \
   '*-o-[log results]:log format:->log-forms: :{_files || _date_formats}' \
@@ -119,9 +119,7 @@ case $state in
       'P[use ICMP timestamp request]' \
       'M[use ICMP netmask request]' \
       'O[IP protocol ping]' \
-      'R[use ARP]' \
-      'O[use IP protocol ping (requires root)]' \
-      && ret=0
+      'R[use ARP]' && ret=0
   ;;
   log-forms)
     _values 'log format' \
@@ -138,7 +136,7 @@ case $state in
   ;;
   ip-options)
     _values -S ' ' "IP option" \
-      'R[record route (9 slots availble)]' \
+      'R[record route (9 slots available)]' \
       'T[record internet timestamps (9 slots)]' \
       'U[record timestamps and ip addresses (4 slots)]' \
       'L[loose source routing (8 slots)]:hop ip' \
diff --git a/Completion/Unix/Command/_zstd b/Completion/Unix/Command/_zstd
index c1b5c65a7..db23e541b 100644
--- a/Completion/Unix/Command/_zstd
+++ b/Completion/Unix/Command/_zstd
@@ -109,7 +109,7 @@ _arguments -s -S : $args \
   '--filelist=[read list of files to operate upon from file]: :_files' \
   '--output-dir-flat=[store processed files in directory]: :_directories' \
   '--output-dir-mirror=[store processed files in directory respecting original structure]: :_directories' \
-  '--no-asyncio[display asynchronous IO]' \
+  '--no-asyncio[disable asynchronous IO]' \
   '--trace=[log tracing information to file]: :_files' \
   + '(M)' \
   \!{-z,--compress,--uncompress} \