diff options
Diffstat (limited to 'Completion/Unix/Command')
| -rw-r--r-- | Completion/Unix/Command/.distfiles | 13 | ||||
| -rw-r--r-- | Completion/Unix/Command/_cal | 50 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ccal | 26 | ||||
| -rw-r--r-- | Completion/Unix/Command/_dhclient | 47 | ||||
| -rw-r--r-- | Completion/Unix/Command/_fortune | 24 | ||||
| -rw-r--r-- | Completion/Unix/Command/_mencal | 49 | ||||
| -rw-r--r-- | Completion/Unix/Command/_perforce | 10 | ||||
| -rw-r--r-- | Completion/Unix/Command/_pump | 42 | ||||
| -rw-r--r-- | Completion/Unix/Command/_surfraw | 24 |
9 files changed, 138 insertions, 147 deletions
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles index 8c9067fa9..39754cb67 100644 --- a/Completion/Unix/Command/.distfiles +++ b/Completion/Unix/Command/.distfiles @@ -6,16 +6,17 @@ _baz _bison _bittorrent _bogofilter _bzip2 _cal _ccal _cdcd _cdrecord _chkconfig _chmod _chown _compress _configure _cpio _cvs -_darcs _dd _dict _diff _du -_dvi _ecasound _elinks _elm _enscript +_darcs _dd _dhclient _dict _diff +_du _dvi +_ecasound _elinks _elm _enscript _fakeroot _fetchmail _figlet _find _finger _flex _fortune _fsh _fuser _gcc _gdb _getconf _getent _global _gnu_generic _gpg _gphoto2 _gprof _grep _groff _gs _gzip _iconv _ifconfig _imagemagick _init_d _irssi -_ispell _java _joe _killall _knock -_kvno +_ispell _java _joe +_killall _knock _kvno _last _less _links _loadkeys _look _lp _ls _lsof _lynx _lzop _mail _make _man _mencal _mh @@ -24,7 +25,7 @@ _mutt _mysql_utils _mysqldiff _ncftp _netcat _nice _nmap _nslookup _pack _patch _pbm _perforce _perl _perldoc _php _pine _postfix _prcs -_printenv _psutils _python +_printenv _psutils _pump _python _raggle _rake _rar _rcs _renice _rlogin _rsync _rubber _ruby _sablotron _samba _sccs _screen _sed @@ -36,6 +37,6 @@ _tin _tla _unace _unexpand _uniq _user_admin _vim _vorbis _vux _w3m _webbrowser _wget _whereis _whois -_wiggle _xargs _xmlsoft _xscreensaver +_wiggle _xargs _xmlsoft _yodl _yp _zcat _zdump _zip ' diff --git a/Completion/Unix/Command/_cal b/Completion/Unix/Command/_cal index b8ebef5c9..82bb98b5f 100644 --- a/Completion/Unix/Command/_cal +++ b/Completion/Unix/Command/_cal @@ -1,32 +1,28 @@ #compdef cal ncal -local calargs ncalargs - -calargs=('-3[three in a row]' - '-m[Monday as first day of the week]') - -ncalargs=('-J[display Julian calendar]' - '-e[display date of western Easter]' - '-o[display date of orthodox Easter]' - '-p[assume as by ncal]' - '-s[country code]' - '-w[print number of the week below each column]') +local args case $service in - (cal) -_arguments \ - "${calargs[@]}" \ - '-j[display Julian days]' \ - '-y[display a calendar for the current year]' \ - '1:month:' \ - '2:year:' - ;; - (ncal) -_arguments \ - "${ncalargs[@]}" \ - '-j[display Julian days]' \ - '-y[display a calendar for the current year]' \ - '1:month:' \ - '2:year:' - ;; + cal) + args=( + '-3[three in a row]' + '-m[Monday as first day of the week]' + ) + ;; + ncal) + args=( + '-J[display Julian calendar]' + '-e[display date of western Easter]' + '-o[display date of orthodox Easter]' + '-p[assume as by ncal]' + '-s[country code]' + '-w[print number of the week below each column]' + ) + ;; esac + +_arguments "${args[@]}" \ + '-j[display Julian days]' \ + '-y[display a calendar for the current year]' \ + '::month' \ + ':year' diff --git a/Completion/Unix/Command/_ccal b/Completion/Unix/Command/_ccal index 63eb6699f..f8e19e157 100644 --- a/Completion/Unix/Command/_ccal +++ b/Completion/Unix/Command/_ccal @@ -1,17 +1,17 @@ #compdef ccal _arguments \ - '-nodata[ignore appointment descriptions file]' \ - '-data-file=[load appointments from file]:caldat file:_files' \ - '-future[show only future appointments on current month]' \ - '-today[show only today'"'"'s appointments on current month]' \ - '-europe[European format (first day is Monday)]' \ - '-american[North American format (first day is Sunday)]' \ - '-maxappts=[display maximum of n appointments]:number of appointments:('{8..50}')' \ - '-pause[pause for keystroke before exiting]' \ - '-nocolor[inhibit use of colors]' \ - '-color-file=[load color definitions from file]:calcol file:_files' \ - '-8bit[display 8-bit ascii characters]' \ - '1:month:(1 2 3 4 5 6 7 8 9 10 11 12 jan feb mar apr may jun jul aug sep oct nov dec)' \ - '2:year:' + '-nodata[ignore appointment descriptions file]' \ + '-data-file=[load appointments from file]:caldat file:_files' \ + '-future[show only future appointments on current month]' \ + "-today[show only today's appointments on current month]" \ + '-europe[European format (first day is Monday)]' \ + '-american[North American format (first day is Sunday)]' \ + '-maxappts=[display maximum of n appointments]:number of appointments:('{8..50}')' \ + '-pause[pause for keystroke before exiting]' \ + '-nocolor[inhibit use of colors]' \ + '-color-file=[load color definitions from file]:calcol file:_files' \ + '-8bit[display 8-bit ascii characters]' \ + '1:month:(1 2 3 4 5 6 7 8 9 10 11 12 jan feb mar apr may jun jul aug sep oct nov dec)' \ + '2:year:' diff --git a/Completion/Unix/Command/_dhclient b/Completion/Unix/Command/_dhclient index 5208ea05b..dafe299d9 100644 --- a/Completion/Unix/Command/_dhclient +++ b/Completion/Unix/Command/_dhclient @@ -1,31 +1,28 @@ #compdef dhclient dhclient3 -local _dhclient_common_args - -_dhclient_common_args=( - '-p[port to transmit to / listen on]:_ports' - '-d[force to run in foreground]' - ':interface:_net_interfaces' -) +local args if _pick_variant three=V3 two --help; then - _arguments \ - '-q[quiet]' \ - '-1[only try once to get a lease]' \ - '-r[release the current lease]' \ - '-lf[lease file]:lease file:_files' \ - '-pf[pid file]:pid file:_files' \ - '-cf[config file]:config file:_files' \ - '-sf[script file]:script file:_files' \ - '-e[env vars to pass to child processes]:env var key value pairs:' \ - '-s[transmit to specific target instead of broadcast]:server:_hosts' \ - '-g[force giaddr field]:relay:_hosts' \ - '-n[do not configure any interfaces]' \ - '-nw[daemonize immediately rather than wait for IP acquisition]' \ - '-w[do not exit if there are no interfaces found to configure]' \ - "$_dhclient_common_args[@]" + args=( + '-q[quiet]' + '-1[only try once to get a lease]' + '-r[release the current lease]' + '-lf[lease file]:lease file:_files' + '-pf[pid file]:pid file:_files' + '-cf[config file]:config file:_files' + '-sf[script file]:script file:_files' + '-e[env vars to pass to child processes]:env var key value pairs:' + '-s[transmit to specific target instead of broadcast]:server:_hosts' + '-g[force giaddr field]:relay:_hosts' + '-n[do not configure any interfaces]' + '-nw[daemonize immediately rather than wait for IP acquisition]' + '-w[do not exit if there are no interfaces found to configure]' + ) else - _arguments \ - '-e[Exit if configuration failed after a certain time]' \ - "$_dhclient_common_args[@]" + args=( '-e[exit if configuration failed after a certain time]' ) fi + +_arguments $args \ + '-p[port to transmit to / listen on]:_ports' \ + '-d[force to run in foreground]' \ + ':interface:_net_interfaces' diff --git a/Completion/Unix/Command/_fortune b/Completion/Unix/Command/_fortune index fec07c436..c0eca56a3 100644 --- a/Completion/Unix/Command/_fortune +++ b/Completion/Unix/Command/_fortune @@ -1,15 +1,15 @@ #compdef fortune _arguments \ - '-a[choose from all lists of maxims, both offensive and not]' \ - '-c[show the cookie file from which the fortune came]' \ - '-e[consider all fortune files to be of equal size]' \ - '-f[print out the list of files which would be searched]' \ - '-l[long dictums only]' \ - '-m[print all matches to regex]:BRE:' \ - '-n[set longest length to be short]:length:' \ - '-o[choose only from potentially offensive aphorisms]' \ - '-s[short apothegms only]' \ - '-i[ignore case for -m patterns]' \ - '-w[wait before termination for a time based on msg length]' \ - '*:databases:' + '-a[choose from all lists of maxims, both offensive and not]' \ + '-c[show the cookie file from which the fortune came]' \ + '-e[consider all fortune files to be of equal size]' \ + '-f[print out the list of files which would be searched]' \ + '-l[long dictums only]' \ + '-m[print all matches to regex]:BRE' \ + '-n[set longest length to be short]:length' \ + '-o[choose only from potentially offensive aphorisms]' \ + '-s[short apothegms only]' \ + '-i[ignore case for -m patterns]' \ + '-w[wait before termination for a time based on msg length]' \ + '*:databases' diff --git a/Completion/Unix/Command/_mencal b/Completion/Unix/Command/_mencal index ef4e88380..224b4e5ba 100644 --- a/Completion/Unix/Command/_mencal +++ b/Completion/Unix/Command/_mencal @@ -1,30 +1,27 @@ #compdef mencal -_arguments \ - '(--monday -m)'{-m,--monday}'[monday as first day of work]' \ - '-1[current month]' \ - '-3[previous, current, and next month]' \ - '-y[all-year calendar]::year:' \ - '(--quiet -q)'{-q,--quiet}'[no top information]' \ - '(--nocolor -n)'{-n,--nocolor}'[noncolored output]' \ - '(--icolor -i)'{-i,--icolor}'[intersection color]:color:(red green blue yellow violet cyan shiny bold)' \ - '(--help -h)'{-h,--help}'[help]' \ - '(--version -V)'{-V,--version}'[print version info]' \ - '(--config -c)*'{-c,--config}'[config]:options:->option' && ret=0 +local curcontext="$curcontext" state line ret=1 - while [[ -n "$state" ]]; do - lstate="$state" - state='' +_arguments -C \ + '(--monday -m)'{-m,--monday}'[monday as first day of work]' \ + '-1[current month]' \ + '-3[previous, current, and next month]' \ + '-y[all-year calendar]::year:' \ + '(--quiet -q)'{-q,--quiet}'[no top information]' \ + '(--nocolor -n)'{-n,--nocolor}'[noncolored output]' \ + '(--icolor -i)'{-i,--icolor}'[intersection color]:color:(red green blue yellow violet cyan shiny bold)' \ + '(-)'{-h,--help}'[display help informaiton]' \ + '(-)'{-V,--version}'[print version information]' \ + \*{-c,--config}'[config]:options:->option' && ret=0 - case "$lstate" in - (option) - _values -s , 'config option' \ - '(s start)'{s,start}'[start day]:' \ - '(l length)'{l,length}'[period length]:' \ - '(d duration)'{d,duration}'[menstruation duration]:' \ - '(n name)'{n,name}'[name of subject]:' \ - '(f file)'{f,file}'[filename]:_files' \ - '(c color)'{c,color}'[color for menstruation days]:color:(red green blue yellow violet cyan shiny bold)' - ;; - esac - done +if [[ $state = option ]]; do + _values -s , 'config option' \ + '(s start)'{s,start}'[start day]:day' \ + '(l length)'{l,length}'[period length]:length' \ + '(d duration)'{d,duration}'[menstruation duration]:duration' \ + '(n name)'{n,name}'[name of subject]:name' \ + '(f file)'{f,file}'[filename]:file:_files' \ + '(c color)'{c,color}'[color for menstruation days]:color:(red green blue yellow violet cyan shiny bold)' && ret=0 +fi + +return ret diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce index 3d7de0cb1..49eb5faba 100644 --- a/Completion/Unix/Command/_perforce +++ b/Completion/Unix/Command/_perforce @@ -1410,10 +1410,10 @@ _perforce_cmd_attribute() { # If -f is present, search unopened files, else don't [[ ${words[(I)-f]} -eq 0 ]] && limit=" -to" _arguments -s : \ - '-e[Value is in hex]' \ - '-f[Set the attribute on a submitted file]' \ - '-n[Set name of attribute]:attribute: ' \ - '-v[Set value of attribute]:value: ' \ + '-e[value is in hex]' \ + '-f[set the attribute on a submitted file]' \ + '-n[set name of attribute]:attribute: ' \ + '-v[set value of attribute]:value: ' \ "*::file:_perforce_files$limit" } @@ -1653,7 +1653,7 @@ _perforce_cmd_fstat() { if [[ ${_perforce_cmd_list[(r)attribute:*]} != '' ]]; then # Unsupported feature, try not to show if not present Oattr=' a\:show\ attributes d\:attributes\ digest e\:attributes\ in\ hex' - Aattr='-A[Restrict attributes by pattern]:attribute pattern: ' + Aattr='-A[restrict attributes by pattern]:attribute pattern: ' fi _arguments -s : \ '-c+[affected since change]:change:_perforce_changes -ts' \ diff --git a/Completion/Unix/Command/_pump b/Completion/Unix/Command/_pump index 08da8d4a4..08ec026ed 100644 --- a/Completion/Unix/Command/_pump +++ b/Completion/Unix/Command/_pump @@ -1,24 +1,24 @@ #compdef pump _arguments \ - '(-c --config-file=)'{-c,--config-file=}'[Configuratio file to use]:Configuratio file to use:_files' \ - '(-h --hostname=)'{-h,--hostname=}'[Hostname to request]:Hostname:_hosts' \ - '(-i --interface=)'{-i,--interface=}'[Interface to configure]:Interface:_net_interfaces' \ - '(-k --kill)'{-k,--kill}'[Kill daemon (and disable all interfaces)]' \ - '(-l --lease=)'{-l,--lease=}'[Lease time to request (in hours)]' \ - '(-L --leasesecs=)'{-L,--leasesecs=}'[Lease time to request (in seconds)]' \ - '(-r --release)'{-r,--release}'[Release interface]:Interface:_net_interfaces' \ - '(-R --renew)'{-R,--renew}'[Force immediate lease renewal]:Interface:_net_interfaces' \ - '(-v --verbose)'{-v,--verbose}'[Log verbose debug info]' \ - '(-s --status)'{-s,--status}'[Display interface status]:Interface:_net_interfaces' \ - '(-d --no-dns)'{-d,--no-dns}"[Don't update resolv.conf]" \ - '(-? --help)'{-?,--help}'[Display help message]' \ - "--no-gateway[Don't set a gateway for this interface]" \ - "--no-setup[Don't set up anything]" \ - "--no-resolvconf[Don't set up resolvconf]" \ - '--no-bootp[Ignore non-DHCP BOOTP responses]' \ - '--lookup-hostname[Force lookup of hostname]' \ - '--script=[Script to use]:Script to use:_files' \ - "--win-client-ident[Set the client identifier to match Window's]" \ - '--usage[Display brief usage message]' \ - ':Interface:_net_interfaces' + '(-c --config-file=)'{-c,--config-file=}'[specify configuration file to use]:configuration file:_files' \ + '(-h --hostname=)'{-h,--hostname=}'[specify hostname to request]:hostname:_hosts' \ + '(-i --interface=)'{-i,--interface=}'[specify interface to configure]:interface:_net_interfaces' \ + '(-k --kill)'{-k,--kill}'[kill daemon (and disable all interfaces)]' \ + '(-l --lease=)'{-l,--lease=}'[specify lease time to request]:time (hours)' \ + '(-L --leasesecs=)'{-L,--leasesecs=}'[specify seconds to request for]:time (seconds)]' \ + '(-r --release)'{-r,--release}'[release interface]:interface:_net_interfaces' \ + '(-R --renew)'{-R,--renew}'[force immediate lease renewal]:interface:_net_interfaces' \ + '(-v --verbose)'{-v,--verbose}'[log verbose debug info]' \ + '(-s --status)'{-s,--status}'[display interface status]:interface:_net_interfaces' \ + '(-d --no-dns)'{-d,--no-dns}"[don't update resolv.conf]" \ + '(- *)'{-?,--help}'[display help information]' \ + "--no-gateway[don't set a gateway for this interface]" \ + "--no-setup[don't set up anything]" \ + "--no-resolvconf[don't set up resolvconf]" \ + '--no-bootp[ignore non-DHCP BOOTP responses]' \ + '--lookup-hostname[force lookup of hostname]' \ + '--script=[specify script to use]:script:_files' \ + "--win-client-ident[set the client identifier to match window's]" \ + '--usage[display brief usage message]' \ + ':interface:_net_interfaces' diff --git a/Completion/Unix/Command/_surfraw b/Completion/Unix/Command/_surfraw index 326504794..20c8349d0 100644 --- a/Completion/Unix/Command/_surfraw +++ b/Completion/Unix/Command/_surfraw @@ -1,15 +1,15 @@ #compdef surfraw sr _arguments \ - '-browser=[set browser]:browser:_command_names' \ - '-elvi[list Surfraw mechanisms for conquering evil]' \ - '-escape-url-args=[apply url escaping to arguments]:bool:(yes no)' \ - '(-g -graphical)'{-g,-graphical}'[get some windowed sin]' \ - '-p0rn=[yes, yes, harder, deeper, faster, oh baybe]:bool:(yes no)' \ - '-help' \ - '-quiet:bool:(yes no)' \ - '-new[start in a new window]' \ - '(-t -text)'{-t,-text}'[back to the yellow brick road]' \ - '(-q -quote)'{-q,-quote}'[quote arguments with quote characters]' \ - '-version[display Surfraw version]' \ - ':elvi: compadd ${${(f)"$(surfraw -elvi)"}%%[[:space:]]##--*}' + '-browser=[set browser]:browser:_command_names' \ + '-elvi[list Surfraw mechanisms for conquering evil]' \ + '-escape-url-args=[apply url escaping to arguments]:bool:(yes no)' \ + '(-g -graphical)'{-g,-graphical}'[get some windowed sin]' \ + '-p0rn=[yes, yes, harder, deeper, faster, oh baybe]:bool:(yes no)' \ + '-help' \ + '-quiet:bool:(yes no)' \ + '-new[start in a new window]' \ + '(-t -text)'{-t,-text}'[back to the yellow brick road]' \ + '(-q -quote)'{-q,-quote}'[quote arguments with quote characters]' \ + '-version[display Surfraw version]' \ + ':elvi: compadd ${${(f)"$(surfraw -elvi)"}%%[[:space:]]##--*}' |