diff options
Diffstat (limited to 'Completion/Linux/Command')
| -rw-r--r-- | Completion/Linux/Command/_docker | 410 | ||||
| -rw-r--r-- | Completion/Linux/Command/_modutils | 2 | ||||
| -rw-r--r-- | Completion/Linux/Command/_qdbus | 114 | ||||
| -rw-r--r-- | Completion/Linux/Command/_strace | 1 | ||||
| -rw-r--r-- | Completion/Linux/Command/_sysstat | 77 | ||||
| -rw-r--r-- | Completion/Linux/Command/_yast | 11 |
6 files changed, 149 insertions, 466 deletions
diff --git a/Completion/Linux/Command/_docker b/Completion/Linux/Command/_docker deleted file mode 100644 index faf17b2be..000000000 --- a/Completion/Linux/Command/_docker +++ /dev/null @@ -1,410 +0,0 @@ -#compdef docker -# -# zsh completion for docker (http://docker.com) -# -# version: 0.3.0 -# github: https://github.com/felixr/docker-zsh-completion -# -# contributers: -# - Felix Riedel -# - Vincent Bernat -# -# license: -# -# Copyright (c) 2013, Felix Riedel -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the <organization> nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -__parse_docker_list() { - awk ' -NR == 1 { - idx=1;i=0;f[i]=0 - header=$0 - while ( match(header, / ([A-Z]+|[A-Z]+ [A-Z]+)/) ) { - idx += RSTART+1 - f[++i]=idx - header = substr($0,idx) - } - f[++i]=999 -} - -NR > 1 '"$1"' { - for(j=0;j<i;j++) { - x[j] = substr($0, f[j], f[j+1]-f[j]-1) - gsub(/[ ]+$/, "", x[j]) - } - printf("%s:%7s, %s\n", x[0], x[3], x[1]) - if (x[6] != "") { - split(x[6], names, /,/) - for (name in names) printf("%s:%7s, %s\n", names[name], x[3], x[1]) - } -} -'| sed -e 's/ \([hdwm]\)\(inutes\|ays\|ours\|eeks\)/\1/' -} - -__docker_stoppedcontainers() { - local expl - declare -a stoppedcontainers - stoppedcontainers=(${(f)"$(_call_program commands docker ps -a | __parse_docker_list '&& / Exit/')"}) - _describe -t containers-stopped "Stopped Containers" stoppedcontainers "$@" -} - -__docker_runningcontainers() { - local expl - declare -a containers - - containers=(${(f)"$(_call_program commands docker ps | __parse_docker_list)"}) - _describe -t containers-active "Running Containers" containers "$@" -} - -__docker_containers () { - __docker_stoppedcontainers "$@" - __docker_runningcontainers "$@" -} - -__docker_images () { - local expl - declare -a images - images=(${(f)"$(_call_program commands docker images | awk '(NR > 1 && $1 != "<none>"){printf("%s", $1);if ($2 != "<none>") printf("\\:%s", $2); printf("\n")}')"}) - images=($images ${(f)"$(_call_program commands docker images | awk '(NR > 1){printf("%s:%-15s in %s\n", $3,$2,$1)}')"}) - _describe -t docker-images "Images" images -} - -__docker_tags() { - local expl - declare -a tags - tags=(${(f)"$(_call_program commands docker images | awk '(NR>1){print $2}'| sort | uniq)"}) - _describe -t docker-tags "tags" tags -} - -__docker_repositories_with_tags() { - if compset -P '*:'; then - __docker_tags - else - __docker_repositories -qS ":" - fi -} - -__docker_search() { - # declare -a dockersearch - local cache_policy - zstyle -s ":completion:${curcontext}:" cache-policy cache_policy - if [[ -z "$cache_policy" ]]; then - zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy - fi - - local searchterm cachename - searchterm="${words[$CURRENT]%/}" - cachename=_docker-search-$searchterm - - local expl - local -a result - if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \ - && ! _retrieve_cache ${cachename#_}; then - _message "Searching for ${searchterm}..." - result=(${(f)"$(_call_program commands docker search ${searchterm} | awk '(NR>2){print $1}')"}) - _store_cache ${cachename#_} result - fi - _wanted dockersearch expl 'Available images' compadd -a result -} - -__docker_caching_policy() -{ - # oldp=( "$1"(Nmh+24) ) # 24 hour - oldp=( "$1"(Nmh+1) ) # 24 hour - (( $#oldp )) -} - - -__docker_repositories () { - local expl - declare -a repos - repos=(${(f)"$(_call_program commands docker images | sed -e '1d' -e 's/[ ].*//' | sort | uniq)"}) - _describe -t docker-repos "Repositories" repos "$@" -} - -__docker_commands () { - # local -a _docker_subcommands - local cache_policy - - zstyle -s ":completion:${curcontext}:" cache-policy cache_policy - if [[ -z "$cache_policy" ]]; then - zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy - fi - - if ( [[ ${+_docker_subcommands} -eq 0 ]] || _cache_invalid docker_subcommands) \ - && ! _retrieve_cache docker_subcommands; - then - _docker_subcommands=(${${(f)"$(_call_program commands - docker 2>&1 | sed -e '1,6d' -e '/^[ ]*$/d' -e 's/[ ]*\([^ ]\+\)\s*\([^ ].*\)/\1:\2/' )"}}) - _docker_subcommands=($_docker_subcommands 'help:Show help for a command') - _store_cache docker_subcommands _docker_subcommands - fi - _describe -t docker-commands "docker command" _docker_subcommands -} - -__docker_subcommand () { - local -a _command_args - case "$words[1]" in - (attach) - _arguments \ - '--no-stdin[Do not attach stdin]' \ - '--sig-proxy[Proxify all received signal]' \ - ':containers:__docker_runningcontainers' - ;; - (build) - _arguments \ - '--no-cache[Do not use cache when building the image]' \ - '-q[Suppress verbose build output]' \ - '--rm[Remove intermediate containers after a successful build]' \ - '-t=-:repository:__docker_repositories_with_tags' \ - ':path or URL:_directories' - ;; - (commit) - _arguments \ - '--author=-[Author]:author: ' \ - '-m=-[Commit message]:message: ' \ - '--run=-[Configuration automatically applied when the image is run]:configuration: ' \ - ':container:__docker_containers' \ - ':repository:__docker_repositories_with_tags' - ;; - (cp) - _arguments \ - ':container:->container' \ - ':hostpath:_files' - case $state in - (container) - if compset -P '*:'; then - _files - else - __docker_containers -qS ":" - fi - ;; - esac - ;; - (diff|export) - _arguments '*:containers:__docker_containers' - ;; - (history) - _arguments \ - '--no-trunc[Do not truncate output]' \ - '-q[Only show numeric IDs]' \ - '*:images:__docker_images' - ;; - (images) - _arguments \ - '-a[Show all images]' \ - '--no-trunc[Do not truncate output]' \ - '-q[Only show numeric IDs]' \ - '--tree[Output graph in tree format]' \ - '--viz[Output graph in graphviz format]' \ - ':repository:__docker_repositories' - ;; - (inspect) - _arguments \ - '--format=-[Format the output using the given go template]:template: ' \ - '*:containers:__docker_containers' - ;; - (import) - _arguments \ - ':URL:(- http:// file://)' \ - ':repository:__docker_repositories_with_tags' - ;; - (info) - ;; - (import) - _arguments \ - ':URL:(- http:// file://)' \ - ':repository:__docker_repositories_with_tags' - ;; - (insert) - _arguments '1:containers:__docker_containers' \ - '2:URL:(http:// file://)' \ - '3:file:_files' - ;; - (kill) - _arguments '*:containers:__docker_runningcontainers' - ;; - (load) - ;; - (login) - _arguments \ - '-e=-[Email]:email: ' \ - '-p=-[Password]:password: ' \ - '-u=-[Username]:username: ' \ - ':server: ' - ;; - (logs) - _arguments \ - '-f[Follow log output]' \ - '*:containers:__docker_containers' - ;; - (port) - _arguments \ - '1:containers:__docker_runningcontainers' \ - '2:port:_ports' - ;; - (start) - _arguments \ - '-a[Attach container'"'"'s stdout/stderr and forward all signals]' \ - '-i[Attach container'"'"'s stding]' \ - '*:containers:__docker_stoppedcontainers' - ;; - (rm) - _arguments \ - '--link[Remove the specified link and not the underlying container]' \ - '-v[Remove the volumes associated to the container]' \ - '*:containers:__docker_stoppedcontainers' - ;; - (rmi) - _arguments \ - '*:images:__docker_images' - ;; - (restart|stop) - _arguments '-t=-[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)' \ - '*:containers:__docker_runningcontainers' - ;; - (top) - _arguments \ - '1:containers:__docker_runningcontainers' \ - '(-)*:: :->ps-arguments' - case $state in - (ps-arguments) - _ps - ;; - esac - - ;; - (ps) - _arguments \ - '-a[Show all containers]' \ - '--before=-[Show only container created before...]:containers:__docker_containers' \ - '-l[Show only the latest created container]' \ - '-n=-[Show n last created containers, include non-running one]:n:(1 5 10 25 50)' \ - '--no-trunc[Do not truncate output]' \ - '-q[Only show numeric IDs]' \ - '-s[Display sizes]' \ - '--since=-[Show only containers created since...]:containers:__docker_containers' - ;; - (tag) - _arguments \ - '-f[force]'\ - ':image:__docker_images'\ - ':repository:__docker_repositories_with_tags' - ;; - (run) - _arguments \ - '-P[Publish all exposed ports to the host]' \ - '-a[Attach to stdin, stdout or stderr]' \ - '-c=-[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)' \ - '--cidfile=-[Write the container ID to the file]:CID file:_files' \ - '-d[Detached mode: leave the container running in the background]' \ - '*--dns=-[Set custom dns servers]:dns server: ' \ - '*-e=-[Set environment variables]:environment variable: ' \ - '--entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \ - '*--expose=-[Expose a port from the container without publishing it]: ' \ - '-h=-[Container host name]:hostname:_hosts' \ - '-i[Keep stdin open even if not attached]' \ - '--link=-[Add link to another container]:link:->link' \ - '--lxc-conf=-[Add custom lxc options]:lxc options: ' \ - '-m=-[Memory limit (in bytes)]:limit: ' \ - '--name=-[Container name]:name: ' \ - '*-p=-[Expose a container'"'"'s port to the host]:port:_ports' \ - '--privileged[Give extended privileges to this container]' \ - '--rm[Remove intermediate containers when it exits]' \ - '--sig-proxy[Proxify all received signal]' \ - '-t[Allocate a pseudo-tty]' \ - '-u=-[Username or UID]:user:_users' \ - '*-v=-[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]:volume: '\ - '--volumes-from=-[Mount volumes from the specified container]:volume: ' \ - '-w=-[Working directory inside the container]:directory:_directories' \ - '(-):images:__docker_images' \ - '(-):command: _command_names -e' \ - '*::arguments: _normal' - - case $state in - (link) - if compset -P '*:'; then - _wanted alias expl 'Alias' compadd -E "" - else - __docker_runningcontainers -qS ":" - fi - ;; - esac - - ;; - (pull|search) - _arguments ':name:__docker_search' - ;; - (push) - _arguments ':repository:__docker_repositories_with_tags' - ;; - (save) - _arguments \ - ':images:__docker_images' - ;; - (wait) - _arguments ':containers:__docker_runningcontainers' - ;; - (help) - _arguments ':subcommand:__docker_commands' - ;; - (*) - _message 'Unknown sub command' - esac - -} - -_docker () { - # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`. - # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`. - if [[ $service != docker ]]; then - _call_function - _$service - return - fi - - local curcontext="$curcontext" state line - typeset -A opt_args - - _arguments -C \ - '-H=-[tcp://host:port to bind/connect to]:socket: ' \ - '(-): :->command' \ - '(-)*:: :->option-or-argument' - - if (( CURRENT == 1 )); then - - fi - case $state in - (command) - __docker_commands - ;; - (option-or-argument) - curcontext=${curcontext%:*:*}:docker-$words[1]: - __docker_subcommand - ;; - esac -} - -_docker "$@" diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_modutils index 66e65d32e..0732aa106 100644 --- a/Completion/Linux/Command/_modutils +++ b/Completion/Linux/Command/_modutils @@ -107,7 +107,7 @@ _modutils() { if _cache_invalid modules-$kver || ! _retrieve_cache modules-$kver; then # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough? - modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) ) + modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz|.ko.xz)(.:t:r:r) ) _store_cache modules-$kver modules fi diff --git a/Completion/Linux/Command/_qdbus b/Completion/Linux/Command/_qdbus new file mode 100644 index 000000000..95a4d5243 --- /dev/null +++ b/Completion/Linux/Command/_qdbus @@ -0,0 +1,114 @@ +#compdef qdbus +# +# Copyright (C) 2015 Thomas Mitterfellner <thomas.mitterfellner@gmail.com> +# +# This file is released under the GPLv2. +# +# version 0.1 + +# get the type of a method: 1 means function, 2 means property +getType () { + case "$1" in + "method"*) echo 1 ;; + "property"*) echo 2 ;; + *) echo 0 ;; + esac +} + +# get the index of a method in an array of methods +getIndex () { + local e + local index + local type_ + index=0 + for e in "${@:2}"; do + index=$(( index + 1 )) + type_=$(getType "$e") + if [[ $type_ == 1 ]] ; then + if [[ "$e" == *"$1("* ]] ; then + echo $index + return 0 + fi + elif [[ $type_ == 2 ]] ; then + if [[ "$e" == *"$1" ]] ; then + echo $index + return 0 + fi + fi + done + echo 0 +} + +_qdbus() { + local curcontext="$curcontext" state line + local services + local path_ + local methods + local names + local types + local properties + local index + typeset -A opt_args + + _arguments "--system[connect to system bus]"\ + "--literal[print literal replies]"\ + "1:service name:->service"\ + "2:path:->path"\ + "3:method:->method"\ + "*:arguments:->arguments" + + case $state in + service) + services=( $(qdbus ${words[@]:1:-1} | grep -E '^([^:])') ) + compadd "$@" $services + ;; + + path) + path_=( $(qdbus ${words[@]:1:-1} 2>/dev/null) ) + + compadd "$@" $path_ + ;; + + method) + IFS=$'\n' + methods=( $(qdbus ${words[@]:1:-1} | \ + grep -e "^method" | \ + sed -r 's/method (.+) (.+)\((.*)\)/\2:\1(\3)/g' 2>/dev/null) ) + properties=( $(qdbus ${words[@]:1:-1} | \ + grep -e "^property" | \ + sed -r 's/property (.+) (.+) (.+)/\3:\1 \2/g' 2>/dev/null) ) + + _describe properties properties -J properties + _describe methods methods -J methods + ;; + + arguments) + IFS=$'\n' + + path_pos=$(( ${(M)#words:#--*} + 2)) + method_pos=$(( $path_pos + 2)) + names=( $(qdbus ${words[@]:1:$path_pos} | grep -e '^[mp]' 2>/dev/null) ) + index=$(getIndex "${words[$method_pos]}" $names[@]) + method=$names[$index] + + arg_pos=$(( ${#words} - $method_pos )) + if [[ $(getType "$method") -eq 1 ]] ; then + method_args="$(echo $method | sed -r 's/(.+) (.+) (.+)\((.*)\)/\4/g')" + IFS=$',' method_args_=(${=method_args}) + num_args=${#method_args_} + if [[ $arg_pos -le $num_args ]] ; then + _message "${method_args_[$arg_pos]}" + fi + else + property_=$(echo "$method" |\ + sed -r 's/property (.+) (.+) (.+)/\1 \2/g') + if [[ $arg_pos -eq 1 ]] ; then + + _message ${property_} + fi + fi + ;; + esac +} + +_qdbus "$@" diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace index 45ebfcf1a..d6dabfd24 100644 --- a/Completion/Linux/Command/_strace +++ b/Completion/Linux/Command/_strace @@ -5,6 +5,7 @@ # - allow negated calls (e.g. -e!write) _sys_calls () { local expl + local -a sys_calls sys_calls=(_llseek _newselect _sysctl accept access acct adjtimex afs_syscall alarm bdflush bind break brk cacheflush diff --git a/Completion/Linux/Command/_sysstat b/Completion/Linux/Command/_sysstat index 60de9d899..2a7128c23 100644 --- a/Completion/Linux/Command/_sysstat +++ b/Completion/Linux/Command/_sysstat @@ -4,80 +4,73 @@ # sysstat-nfsiostat - there seems to be two nfsiostat(1)s. one from oracle and one by redhat. _mpstat() { - local ret=1 _arguments : \ '-A[equivalent to -u -I ALL -P ALL]' \ - '-I[report interrupt statistics]:interrupts:(SUM CPU SCPU ALL)' \ - '-P[specify processor number]:processor: _values -s "," processor ON ALL' \ + '-I[report interrupt statistics]:interrupt:(SUM CPU SCPU ALL)' \ + '-P[specify processor number]:processor: _values -s "," processor ON ALL {1..$(_call_program processors getconf _NPROCESSORS_ONLN)}' \ '-u[report CPU utilization]' \ '-V[print version number]' \ - '1:interval:_guard "[0-9]#" "interval"' \ - '2:count:_guard "[0-9]#" "count"' && ret=0 - return ret + '1:interval' \ + '2:count' } _iostat() { - local ret=1 _arguments : \ '-c[display CPU utilization report]' \ '-d[display device utilization report]' \ '-T[only display global statistics for group_name]' \ - '-g[display statistics for a group of devices]:group name: _message "group name"' \ + '-g[display statistics for a group of devices]:group name' \ '-h[human readable device utilization report]' \ '-j[display persistent device name]' \ '(-m)-k[display statistics in kB/s]' \ '(-k)-m[display statistics in MB/s]' \ '-N[display registered device mapper names]' \ - '1:interval:_guard "[0-9]#" "interval"' \ - '2:count:_guard "[0-9]#" "count"' && ret=0 - return ret + '::device:_files -W /dev -g "*(-%)"' \ + ': :_guard "[0-9]#" "interval"' \ + ':count' } _cifsiostat() { - local ret=1 _arguments : \ '-h[human readable]' \ '(-m)-k[display statistics in kB/s]' \ '(-k)-m[display statistics in MB/s]' \ '-t[print timestamp for each report]' \ '-V[print version number]' \ - '1:interval:_guard "[0-9]#" "interval"' \ - '2:count:_guard "[0-9]#" "count"' && ret=0 - return ret + '1:interval' \ + '2:count' } _isag() { - local ret=1 _arguments : \ - '-p[Pathname to daily data files]:data files: _files -/' \ - '-c[Specify configuration file]:configuration file: _files' \ - '-ght[Specify height of the chart]:height: _message "height"' \ - '-gwd[Specify width of the chart]:width: _message "width"' && ret=0 - return ret + '-p[specify path to daily data files]:path:_files -/' \ + '-c[specify configuration file]:configuration file:_files' \ + '-ght[specify height of the chart]:height' \ + '-gwd[specify width of the chart]:width' } _sadf() { - local ret=1 line state context expl - typeset -A opt_args + local ret=1 # any options after `--' are for sar(1) if ! (( CURRENT > $words[(i)--] )); then _arguments : \ '-C[display comments in file]' \ '(-j -p -x)-d[output file in SQL format]' \ - '-e[set ending time of report]:ending time: _message "ending time in localtime(HH\:MM\:SS 24-hour format)"' \ + '-e[set ending time of report]:ending time (HH\:MM\:SS)' \ '-H[display only the header of the report]' \ '(-j -p -x)-h[print on a single line when used with -d]' \ '(-d -p -x)-j[output file in JSON]' \ '-P[restrict processor dependant statistics]:processor number(zero indexed) or ALL:(ALL)' \ '(-j -x -d)-p[print in format parsable by tools like awk]' \ - '-s[set starting time of report]:starting time: _message "starting time in localtime(HH\:MM\:SS 24-hour format)"' \ + '-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]' \ - '(-t -T)-U[display in seconds from epoch(UTC)]' \ + '(-t -T)-U[display in seconds since epoch (UTC)]' \ '-V[print version number]' \ '(-j -d -p)-x[output file in XML]' \ - '1:interval:_guard "[0-9]#" "interval"' \ - '2:count:_guard "[0-9]#" "count"' && ret=0 + '1:interval' \ + '2:count' \ + '3:data file:_files' && ret=0 else _arguments : '*::sar: _sar' && ret=0 fi @@ -85,20 +78,19 @@ _sadf() { } _sar() { - local ret=1 _arguments : \ '-A[equivalent to -bBdFHqrRSuvwWy -I SUM -I XALL -m ALL -n ALL -u ALL -P ALL]' \ '-B[report paging statistics]' \ '-b[report I/O and transfer rate statistics]' \ '-C[display comments from sadc]' \ '-d[report activity for each block device]' \ - '-e[set ending time of report]:ending time: _message "ending time (HH\:MM\:SS 24-hour format)"' \ + '-e[set ending time of report]:ending time (HH\:MM\:SS)' \ '-F[display statistics for mounted filesystems]' \ '-f[extract records from file]:record:_files' \ '-H[report hugepages utilization]' \ '-h[display help]' \ '*-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: _message "interval"' \ + '-i[select records as close as possible to interval]:interval' \ '-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 ALL' \ @@ -108,27 +100,25 @@ _sar() { '-R[report memory statistics]' \ '-r[report memory utilization statistics]' \ '-S[report swap space utilization]' \ - '-s[set starting time of report]:start time: _message "start time (HH\:MM\:SS 24-hour format)"' \ + '-s[set starting time of report]:start time (HH\:MM\:SS)' \ '-u[report CPU utilization]: :(ALL)' \ '-V[print version number]' \ '-v[report status of kernel tables]' \ '-W[report swapping statistics]' \ '-w[report task creation and system switching activity]' \ '-y[report TTY device activity]' \ - '1:interval:_guard "[0-9]#" "interval"' \ - '2:count:_guard "[0-9]#" "count"' && ret=0 - return ret + '1:interval' \ + '2:count' } _pidstat() { - local ret=1 _arguments : \ - '-C[filter tasks by string]:task: _message "string or regex"' \ + '-C[filter tasks by string]:task filter' \ '-d[report I/O statistics]' \ '-h[display on horizontally]' \ '-I[divide CPU usage by number of processors]' \ '-l[display process name along with arguments]' \ - '-p[select pid]:pid: _pids' \ + '-p[select pid]:pid: _sequence _pids' \ '-r[report page faults and memory]' \ '-s[report stack utilization]' \ '-T[specifies what to monitor]:type:(TASK CHILD ALL)' \ @@ -137,14 +127,13 @@ _pidstat() { '-u[report cpu utilization]' \ '-V[print version number]' \ '-v[display values from kernel table]' \ - '-w[report task switching activity]' && ret=0 - return ret + '-w[report task switching activity]' \ + ':interval' ':count' } _sysstat() { - local ret=1 - _call_function ret _$service - return ret -} + local ret + _call_function ret _$service && return ret +} _sysstat "$@" diff --git a/Completion/Linux/Command/_yast b/Completion/Linux/Command/_yast deleted file mode 100644 index f008b404f..000000000 --- a/Completion/Linux/Command/_yast +++ /dev/null @@ -1,11 +0,0 @@ -#compdef yast yast2 - -_arguments \ - '(- 1)'{-h,--help}'[display help information]' \ - '(- 1)'{-l,--list}'[list all available modules]' \ - '(-g --geometry)'{-g,--geometry}'[specify default window size]:_x_geometry' \ - '(-s --style)'{-s,--style}'[specify widget style]:style:(qt)' \ - '--noborder[no window manager border for main window]' \ - '--fullscreen[use full screen]' \ - '(-)'{-i,--install}'[install package]:*:package file:_files -g "*.rpm(-.)"' \ - '1:module:( ${${(f)"$($words[1] -l 2>/dev/null)"}[2,-1]##* } )' |