From 245503929e0369e985e694684b557aef6d1432eb Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Tue, 28 Aug 2018 23:16:54 +0200 Subject: 43346: various completion option updates --- Completion/Linux/Command/_cryptsetup | 22 ++++++++++++++++++---- Completion/Linux/Command/_networkmanager | 1 + Completion/Linux/Command/_strace | 4 +++- Completion/Linux/Command/_sysstat | 10 ++++++++++ 4 files changed, 32 insertions(+), 5 deletions(-) (limited to 'Completion/Linux') diff --git a/Completion/Linux/Command/_cryptsetup b/Completion/Linux/Command/_cryptsetup index 351859586..ddb2ad3a9 100644 --- a/Completion/Linux/Command/_cryptsetup +++ b/Completion/Linux/Command/_cryptsetup @@ -1,8 +1,9 @@ #compdef cryptsetup -local curcontext="$curcontext" ret=1 +local curcontext="$curcontext" ign ret=1 local -a actions state line expl +(( $#words > 2 )) && ign='!' _arguments -s \ '(-v --verbose)'{-v,--verbose}'[enable verbose mode]' \ '--debug[enable debug mode]' \ @@ -65,9 +66,10 @@ _arguments -s \ '--label=[set label for the LUKS2 device]:label' \ '--subsystem=[set subsystem label for the LUKS2 device]:subsystem' \ '--unbound[create unbound (no assigned data segment) LUKS2 keyslot]' \ - '(- : *)--version[show version information]' \ - '(- : *)'{-\?,--help}'[display help information]' \ - '(- : *)--usage[display brief usage]' \ + '--json-file=[read or write token to json file]:json file:_files -g "*.json(-.)"' \ + "${ign}(- : *)--version[show version information]" \ + "${ign}(- : *)"{-\?,--help}'[display help information]' \ + "${ign}(- : *)--usage[display brief usage]" \ ':action:->actions' \ '*::arguments:->action-arguments' && ret=0 @@ -97,6 +99,7 @@ case $state in 'luksResume:resume suspended LUKS device' 'luksHeaderBackup:store binary backup of headers' 'luksHeaderRestore:restore header backup' + 'token:manipulate auto-activation token of the device' ) _describe action actions && ret=0 ;; @@ -118,6 +121,17 @@ case $state in args=( $device ':key file:_files' ) ;; luksHeader*) args=( $device '--header-backup-file:file:_files' );; + token) + args=( + ':action:(( + add\:create\ a\ new\ keyring + remove\:remove\ any\ token\ from\ slot + import\:store\ arbitrary\ valid\ token\ json\ in\ LUKS2\ header + export\:write\ requested\ token\ json\ to\ a\ file + ))' + $device + ) + ;; *) _default && ret=0 ;; diff --git a/Completion/Linux/Command/_networkmanager b/Completion/Linux/Command/_networkmanager index e38215e76..fa9301971 100644 --- a/Completion/Linux/Command/_networkmanager +++ b/Completion/Linux/Command/_networkmanager @@ -6,6 +6,7 @@ _networkmanager() { local curcontext="$curcontext" state line _arguments -C \ + '(-o -overview)-o'{,verview}'[overview mode (hide default values)]' \ '(-p -pretty -t -terse)-t'{,erse}'[terse output]' \ '(-p -pretty -t -terse)-p'{,retty}'[pretty output]' \ '(-m -mode)-m'{,ode}'[output mode]:mode:(tabular multiline)' \ diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace index cff9a49c6..83ccc6afb 100644 --- a/Completion/Linux/Command/_strace +++ b/Completion/Linux/Command/_strace @@ -54,7 +54,9 @@ case $state in 'signal[trace only the specified subset of signals]:signal:_sequence _signals -s -M "B\:!="' \ 'read[perform a full hex and ASCII dump of all the data read from listed file descriptors]:file descriptor:_sequence _file_descriptors' \ 'write[perform a full hex and ASCII dump of all the data written to listed file descriptors]:file descriptor:_sequence _file_descriptors' \ - 'fault[perform syscall fault injection]:system call:_sys_calls -a -n' && ret=0 + 'fault[perform syscall fault injection]:system call:_sys_calls -a -n' \ + 'inject[perform syscall tampering]:system call:_sys_calls -a -n' \ + 'kvm[print the exit reason of kvm vcpu]: :(vcpu)' && ret=0 if [[ $words[CURRENT] != *=* || $state = syscalls ]]; then local dedup sets suf="-qS," compset -P '!' diff --git a/Completion/Linux/Command/_sysstat b/Completion/Linux/Command/_sysstat index 8b7929ddd..e091dd3ea 100644 --- a/Completion/Linux/Command/_sysstat +++ b/Completion/Linux/Command/_sysstat @@ -8,6 +8,7 @@ _mpstat() { '(-A)-I[report interrupt statistics]:interrupt:(SUM CPU SCPU ALL)' \ '(-A)-N[specify NUMA nodes]:NUMA node' \ '(-A)-n[report summary CPU statistics based on NUMA node placement]' \ + '--dec=-[specify the number of decimal places to use]:decimal places [2]:(0 1 2)' \ '-o[display statistics in JSON]:format:(JSON)' \ '(-A)-P[specify processor number]:processor: _values -s "," processor ALL {0..$(_call_program processors getconf _NPROCESSORS_ONLN)}' \ '-u[report CPU utilization]' \ @@ -18,6 +19,7 @@ _mpstat() { _cifsiostat() { _arguments : \ + '--dec=-[specify the number of decimal places to use]:decimal places [2]:(0 1 2)' \ '-h[human readable]' \ '(-m)-k[display statistics in kB/s]' \ '(-k)-m[display statistics in MB/s]' \ @@ -49,6 +51,9 @@ _sadf() { '-O[specify output options]: : _values -s , option autoscale height\:value oneday packed showidle showinfo skipempty showhints' \ '-P[restrict processor dependant statistics]:processor number(zero indexed) or ALL:(ALL)' \ + '--dev=-[specify block devices for which statistics are to be displayed]:block device:_files -g "*(-%)"' \ + '--fs=-[specify filesystems for which statistics are to be displayed]:file system:_dir_list -s ,' \ + '--iface=-[specify network interfaces for which statistics are to be displayed]:network interface:_sequence _net_interfaces' \ '-s[set starting time of report]:starting time (HH\:MM\:SS)"' \ '(-t -U)-T[display timestamp in local time]' \ '(-T -U)-t[display timestamp in file\''s original localtime]' \ @@ -81,15 +86,19 @@ _sar() { '-C[display comments from sadc]' \ '-D[use saYYYYMMDD instead of saDD as the standard system activity daily data file name]' \ '-d[report activity for each block device]' \ + '--dec=-[specify the number of decimal places to use]:decimal places [2]:(0 1 2)' \ + '--dev=-[specify block devices for which statistics are to be displayed]:block device:_files -g "*(-%)"' \ '-e[set ending time of report]:ending time (HH\:MM\:SS)' \ '-F[display statistics for mounted filesystems]' \ '-f[extract records from file]:record:_files' \ + '--fs=-[specify filesystems for which statistics are to be displayed]:file system:_dir_list -s ,' \ '-H[report hugepages utilization]' \ '(--human -p)-h[make output easier to read: implies --human and -p]' \ '(- 1 2)--help[display usage information]' \ '--human[print sizes in human readable format]' \ '*-I[report statistics for interrupts]:interrupts: _values -s "," interrupts 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 SUM ALL XALL' \ '-i[select records as close as possible to interval]:interval' \ + '--iface=-[specify network interfaces for which statistics are to be displayed]:network interface:_sequence _net_interfaces' \ '-j[display persistent device names]:type:(ID LABEL PATH UUID)' \ '-m[report power management statistics]:keywords: _values -s "," keywords CPU FAN FREQ IN TEMP USB ALL' \ '-n[report network statistics]:keywords: _values -s "," keywords DEV EDEV NFS NFSD SOCK IP EIP ICMP EICMP TCP ETCP UDP SOCK6 IP6 EIP6 ICMP6 EICMP6 UDP6 FC SOFT ALL' \ @@ -135,6 +144,7 @@ _pidstat() { '-v[display values from kernel table]' \ '-w[report task switching activity]' \ '-G[include only processes with specified name]:process name' \ + '--dec=-[specify the number of decimal places to use]:decimal places [2]:(0 1 2)' \ '--human[print sizes in human readable format]' \ '1: : _guard "^-*" interval' \ '2: : _guard "^-*" count' -- cgit 1.4.1