diff --git a/ChangeLog b/ChangeLog index 3f1014db3..ed7d8568c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2023-11-02 Oliver Kiddle + * 52265: Completion/Linux/Command/_findmnt, + Completion/Linux/Command/_lsblk, Completion/Unix/Command/_column: + update completions for some util-linux tools to version 2.39.2 + * 52253: Src/Modules/pcre.c: support pcre callouts with shell evaluation of the callout string diff --git a/Completion/Linux/Command/_findmnt b/Completion/Linux/Command/_findmnt index 0c832364d..b29372c39 100644 --- a/Completion/Linux/Command/_findmnt +++ b/Completion/Linux/Command/_findmnt @@ -26,6 +26,7 @@ _arguments -s -C \ '(H -o --output)--output-all[output all available columns]' \ '(H -p --poll)'{-p+,--poll=}'[monitor changes in /proc/self/mountinfo]::action:(mount umount remount move)' \ '(H --real)--pseudo[print only pseudo-filesystems]' \ + '(H)--shadowed[print only filesystems over-mounted by another filesystem]' \ '(H -R --submounts)'{-R,--submounts}'[print recursively all submounts]' \ '(H --pseudo)--real[print only real filesystems]' \ '(H -S --source :)'{-S+,--source=}'[specify the mount source]: :->sources' \ @@ -35,9 +36,11 @@ _arguments -s -C \ '(H -U --uniq)'{-U,--uniq}'[ignore filesystems with duplicated mount targets]' \ '(H -u --notruncate)'{-u,--notruncate}'[do not truncate text in columns]' \ '(H -v --nofsroot)'{-v,--nofsroot}'[do not print \[/dir\] in the SOURCE column]' \ + '(H -y --shell -n --noheadings)'{-y,--shell}'[use column names usable as shell variable identifiers]' \ '(H -w --timeout)'{-w+,--timeout}'[specify timeout for --poll]:milliseconds: ' \ '(H -x --verify)'{-x,--verify}'[check mount table content]' \ '(H)--verbose[print more information]' \ + '(H)--vfs-all[print all VFS options]' \ '(H)1: :->sources_targets' \ '(H)2:: :->targets' \ + '(format)' \ diff --git a/Completion/Linux/Command/_lsblk b/Completion/Linux/Command/_lsblk index 8a9bc18bf..63aac743c 100644 --- a/Completion/Linux/Command/_lsblk +++ b/Completion/Linux/Command/_lsblk @@ -6,16 +6,19 @@ local curcontext="$curcontext" state line expl typeset -A opt_args _arguments -C -s -S \ + '(H -A --noempty)'{-A,--noempty}"[don't print empty devices]" \ '(H -E --dedup)'{-E+,--dedup=}'[de-duplicate output by specified column]:column:->columns' \ '(H -a --all)'{-a,--all}'[print all devices]' \ '(H -b --bytes)'{-b,--bytes}'[print size in bytes rather than in human readable format]' \ '(H -d --nodeps)'{-d,--nodeps}"[don't print slaves or holders]" \ '(H -I --include)*'{-e,--exclude}'[exclude devices by major number]:major device number:->majorlist' \ '(H -e --exclude)*'{-I+,--include=}'[show only devices with specified major numbers]:major device number:->majorlist' \ - '(H -n --noheadings)'{-n,--noheadings}"[don't print headings]" \ + '(H -n --noheadings -y --shell)'{-n,--noheadings}"[don't print headings]" \ '(H -p --paths)'{-p,--paths}'[print complete device path]' \ '(H -s --inverse)'{-s,--inverse}'[reverse dependency order]' \ + '(H -w --width)'{-w+,--width=}'[specify output width]:width' \ '(H -x --sort)'{-x+,--sort=}'[sort output by specified column]:column:->columns' \ + '(H -y --shell -n --noheadings)'{-y,--shell}'[use column names usable as shell variable identifiers]' \ '(H)--sysroot=[use specified directory as system root]:directory:_directories' \ '*:device:_files -g "*(-%b)" -P / -W /' \ + fields \ @@ -24,6 +27,8 @@ _arguments -C -s -S \ '(H -f --fs -o --output -O --output-all)'{-f,--fs}'[output info about filesystems]' \ '(H -m --perms -o --output -O --output-all)'{-m,--perms}'[output info about permissions]' \ '(H -S --scsi -o --output -O --output-all)'{-S,--scsi}'[output info about SCSI devices]' \ + '(H -N --nvme -o --output -O --output-all)'{-N,--nvme}'[output info about NVMe devices]' \ + '(H -v --virtio -o --output -O --output-all)'{-v,--virtio}'[output info about virtio devices]' \ '(H -t --topology -o --output -O --output-all)'{-t,--topology}'[output info about topology]' \ '(H fields)'{-o+,--output=}'[specify output columns]:output column:->columnlist' \ '(H fields)'{-O,--output-all}'[output all columns]' \ diff --git a/Completion/Unix/Command/_column b/Completion/Unix/Command/_column index 94bdccf0a..687d7620f 100644 --- a/Completion/Unix/Command/_column +++ b/Completion/Unix/Command/_column @@ -22,7 +22,7 @@ case $variant in aopts=() args=( '(info json -c --output-width)'{-c+,--output-width=}'[format output to fit display of specified width]:width' - '(info)'{-L,--table-empty-lines}"[don't ignore empty lines]" + '(info)'{-L,--keep-empty-lines}"[don't ignore empty lines]" + fill '(info table text json -x --fillrows)'{-x,--fillrows}'[print across before down]' + table @@ -30,8 +30,20 @@ case $variant in '(info fill -o --output-separator)'{-o+,--output-separator=}'[specify column separator for table output]:separator [two spaces]' '(info fill -s --separator)'{-s+,--separator=}'[specify column delimiters in input data]:delimiters' '(info fill -O --table-order)'{-O+,--table-order=}'[specify order of output columns]: :->columns' - '(info fill -N --table-columns)'{-N+,--table-columns=}'[specify column names]:names' + '(info fill -N --table-columns)*'{-C+,--table-column=}'[specify column properties]: :_values -s, -S= property + "name[column name]\:name" + "trunc[truncate text in the columns when necessary]" + "right[right align text]" + "width[specify column width]\:width" + "strictwidth[strictly follow column width setting]" + "noextreme[allow length to be ignored]" + "wrap[wrap text when necessary]" + "hide[don'\''t print column]" + "json[define type for JSON output]\:type\:(string number boolean)"' + '(info fill -N --table-columns -C --table-column)'{-N+,--table-columns=}'[specify column names]:names' + '(info fill -l --table-columns-limit)'{-l+,--table-columns-limit=}'[specify maximum number of input columns]:columns' '(info fill -H --table-hide)'{-H+,--table-hide=}"[don't print specified columns]: :->columns" + '(info fill -m --table-maxout)'{-m,--table-maxout}'[fill all available space]' + text '(info fill json -d --table-noheadings)'{-d,--table-noheadings}"[don't print header]" '(info fill json -E --table-noextreme)'{-E+,--table-noextreme}"[specify columns where length can be ignored]: :->columns"