* PATCH: update Cygwin completion functions
@ 2009-01-24 13:53 Doug Kearns
2009-01-25 13:39 ` Clint Adams
0 siblings, 1 reply; 4+ messages in thread
From: Doug Kearns @ 2009-01-24 13:53 UTC (permalink / raw)
To: zsh-workers
This updates the Cygwin related completion functions for the latest
versions of those commands, fixes a few bugs, and adds rudimentary
completion for setfacl and readshortcut.
Felix, I also removed the "Generated by" tags to prevent future
confusion as I didn't use the generator to update them.
Regards,
Doug (nee Rosie)
Index: Completion/Cygwin/Command/.distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/.distfiles,v
retrieving revision 1.1
diff -u -r1.1 .distfiles
--- Completion/Cygwin/Command/.distfiles 22 Apr 2003 12:49:14 -0000 1.1
+++ Completion/Cygwin/Command/.distfiles 24 Jan 2009 13:39:31 -0000
@@ -1,6 +1,7 @@
DISTFILES_SRC='
.distfiles
-_cygcheck _cygpath _cygrunsrv _cygserver _cygstart
-_dumper _getclip _getfacl _mkshortcut _mkzsh
-_pscp _putclip
+_cygcheck _cygpath _cygrunsrv _cygserver
+_cygstart _dumper _getclip _getfacl
+_mkshortcut _mkzsh _pscp _putclip
+_readshortcut _setfacl
'
Index: Completion/Cygwin/Command/_cygcheck
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_cygcheck,v
retrieving revision 1.1
diff -u -r1.1 _cygcheck
--- Completion/Cygwin/Command/_cygcheck 7 Apr 2003 11:23:18 -0000 1.1
+++ Completion/Cygwin/Command/_cygcheck 24 Jan 2009 13:39:31 -0000
@@ -1,14 +1,31 @@
#compdef cygcheck cygcheck.exe
-#Generated by Felix Rosencrantz
-local context state line
+# cygwin 1.5.25
+
+local curcontext="$curcontext" state line expl
typeset -A opt_args
-_arguments \
- '(--check-setup --help -c -h)'{-c,--check-setup}'[check packages installed via setup.exe]' \
- '(--keycheck --sysinfo -k -s)'{-s,--sysinfo}'[system information (not with -k)]' \
- '(--verbose -v)'{-v,--verbose}'[verbose output (indented) (for -s or programs)]' \
- '(--registry -r)'{-r,--registry}'[registry search (requires -s)]' \
- '(--keycheck --sysinfo -k -s)'{-k,--keycheck}'[perform a keyboard check session (not with -s)]' \
- '(--check-setup --help -c -h)'{-h,--help}'[give help about the info (not with -c)]' \
- '(--version -V)'{-V,--version}'[output version information and exit]' \
- '*:program: _command_names -e:*::program arguments: _normal'
+
+local -a exclusive_opts
+exclusive_opts=(-k --keycheck -f --find-package -l --list-package -p --package-query -h --help -V --version)
+
+_arguments -C -s -S \
+ "(* $exclusive_opts -c --check-setup)"{-c,--check-setup}'[show installed version of the specified package and verify integrity (or for all installed packages if none specified)]:*:package:->package' \
+ "(* $exclusive_opts -d --dump-only)"{-d,--dump-only}'[just list packages, do not verify (with -c)]' \
+ "(* $exclusive_opts -s --sysinfo)"{-s,--sysinfo}'[produce diagnostic system information (implies -c -d)]' \
+ "(* $exclusive_opts -r --registry)"{-r,--registry}'[also scan registry for Cygwin settings (with -s)]' \
+ '(* -)'{-k,--keycheck}'[perform a keyboard check session (must be run from a plain console only, not from a pty/rxvt/xterm)]' \
+ '(* -)'{-f,--find-package}'[find the package that specified file belongs to]:*:file:_files' \
+ '(* -)'{-l,--list-package}'[list contents of the specified package (or all packages if none given)]:*:package:->package' \
+ '(* -)'{-p,--package-query}'[search for the specified regexp in the entire cygwin.com package repository (requires internet connectivity)]:regexp:' \
+ '(-V --version -k --keycheck -f --find-package -l --list-package -p --package-query -c --check-setup -d --dump-only -v --verbose)'{-v,--verbose}'[produce more verbose output]' \
+ '(-V --version -k --keycheck -f --find-package -l --list-package -p --package-query -c --check-setup -d --dump-only -h --help)'{-h,--help}'[annotate output with explanatory comments when given with another command, otherwise print this help]' \
+ '(* -)'{-V,--version}'[print the version of cygcheck and exit]' \
+ '(-)*:program: _command_names -e' && return
+
+if [[ "$state" = package ]]; then
+ local -a packages
+ packages=( ${${${(f)"$(_call_program packages $words[1] -c -d)"}[3,-1]}%% *} )
+ _wanted packages expl package compadd -a packages && return
+fi
+
+return 1
Index: Completion/Cygwin/Command/_cygpath
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_cygpath,v
retrieving revision 1.2
diff -u -r1.2 _cygpath
--- Completion/Cygwin/Command/_cygpath 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_cygpath 24 Jan 2009 13:39:31 -0000
@@ -1,26 +1,28 @@
#compdef cygpath cygpath.exe
-#Generated by Felix Rosencrantz
-_arguments \
- '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-d,--dos}'[print DOS (short) form of NAME (C:\PROGRA~1\)]' \
- '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-m,--mixed}'[like --windows, but with regular slashes (C:/WINNT)]' \
- '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-u,--unix}'[(default) print Unix form of NAME (/cygdrive/c/winnt)]' \
- '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-w,--windows}'[print Windows form of NAME (C:\WINNT)]' \
- '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-t,--type}':print type:(dos mixed unix windows)' \
+# cygwin 1.5.25
+
+_arguments -s -S \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-d,--dos}'[print DOS (short) form of specified path (C:\PROGRA~1\)]' \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-m,--mixed}'[like --windows, but with regular slashes (C:/WINNT)]' \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-M,--mode}'[report on mode of file (binmode or textmode)]' \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-u,--unix}'[(default) print Unix form of specified path (/cygdrive/c/winnt)]' \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-w,--windows}'[print Windows form of specified path (C:\WINNT)]' \
+ '(--dos --mixed --mode --type --unix --windows -d -m -M -t -u -w)'{-t,--type}'[print type]:type:(dos mixed unix windows)' \
'(--absolute --long-name --path --short-name -a -l -p -s)'{-a,--absolute}'[output absolute path]' \
- '(--absolute --long-name --path --short-name -a -l -p -s)'{-l,--long-name}'[print Windows long form of NAME (with -w, -m only)]' \
- "(--absolute --long-name --path --short-name -a -l -p -s)"{-p,--path}"[NAME is a PATH list (i.e., '/bin:/usr/bin')]" \
- '(--absolute --long-name --path --short-name -a -l -p -s)'{-s,--short-name}'[print DOS (short) form of NAME (with -w, -m only)]' \
+ '(--absolute --long-name --path --short-name -a -l -p -s)'{-l,--long-name}'[print Windows long form of specified path (with -w, -m only)]' \
+ "(--absolute --long-name --path --short-name -a -l -p -s)"{-p,--path}"[specified path is a PATH list (i.e., '/bin:/usr/bin')]" \
+ '(--absolute --long-name --path --short-name -a -l -p -s)'{-s,--short-name}'[print DOS (short) form of specified path (with -w, -m only)]' \
"(--allusers -A)"{-A,--allusers}"[use 'All Users' instead of current user for -D, -P]" \
"(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)"{-D,--desktop}"[output 'Desktop' directory and exit]" \
"(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)"{-H,--homeroot}"[output 'Profiles' directory (home root) and exit]" \
"(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)"{-P,--smprograms}"[output Start Menu 'Programs' directory and exit]" \
'(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)'{-S,--sysdir}'[output system directory and exit]' \
"(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)"{-W,--windir}"[output 'Windows' directory and exit]" \
- '(--file -f)'{-f,--file}':read FILE for input; use - to read from STDIN:_files' \
+ '(--file -f)'{-f,--file}'[read FILE for input; use - to read from STDIN]: :_files' \
'(--option -o)'{-o,--option}'[read options from FILE as well (for use with --file)]' \
'(--close -c)'{-c,--close}'[close specified handle (for use in captured process)]:handle' \
'(--ignore -i)'{-i,--ignore}'[ignore missing argument]' \
- '(- 1)'{-h,--help}'[display usage information]' \
- '(- 1)'{-v,--version}'[display version information]' \
- '1: :_files' && return 0
+ '(- *)'{-h,--help}'[display usage information]' \
+ '(- *)'{-v,--version}'[display version information]' \
+ '*: :_files'
Index: Completion/Cygwin/Command/_cygrunsrv
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_cygrunsrv,v
retrieving revision 1.2
diff -u -r1.2 _cygrunsrv
--- Completion/Cygwin/Command/_cygrunsrv 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_cygrunsrv 24 Jan 2009 13:39:31 -0000
@@ -1,11 +1,16 @@
#compdef cygrunsrv cygrunsrv.exe
-_arguments \
+# cygrunsrv 1.34
+
+_arguments -s -S \
'(-I --install)'{-I,--install}'[install a new service]:service' \
'(-R --remove)'{-R,--remove}'[remove specified service]:service' \
'(-S --start)'{-S,--start}'[start specified service]:service' \
'(-E --stop)'{-E,--stop}'[stop specified service]:service' \
+ '(-Q --query)'{-Q,--query}'[query specified service]:service' \
+ '(-L --list)'{-L,--list}'[lists services that have been installed with cygrunsrv]:server:' \
'(-p --path)'{-p,--path}'[specify application path which is run as a service]:application path' \
+ '(-P --crs-path)'{-P,--crs-path}'[path to cygrunsrv]:path:_files' \
'(-a --args)'{-a,--args}'[specify options to give service on startup]:args' \
'(-c --chdir)'{-c,--chdir}'[specify working directory for the application]:directory:_directories' \
'(-e --env)'{-e,--env}'[specify environment strings exported to service]:var=value' \
@@ -15,11 +20,17 @@
'(-u --user)'{-u,--user}'[specify user to start service under]:user:_users' \
'(-w --passwd)'{-w,--passwd}'[specify password for user]:password' \
'(-s --termsig)'{-s,--termsig}'[specify signal to use to stop service]:signal:_signals' \
+ '(-z --shutsig)'{-z,--shutsig}'[specify signal to send to service application when shutdown has been initiated]:signal:_signals' \
'(-y --dep)'{-y,--dep}'[specify name of service that must be started]:service' \
- '(-0 --stdin)'{-0,--stdin}'[specify file for stdin redirection]:file:_files' \
- '(-1 --stdout)'{-1,--stdout}'[specify file for stdout redirection]:file:_files' \
- '(-2 --stderr)'{-2,--stderr}'[specify file for stderr redirection]:file:_files' \
- '(-o --shutdown)'{-o,--shutdown}'[stop service application during system shutdown]' \
+ '(-0 --stdin)'{-0,--stdin}'[specify file for stdin redirection]:stdin file:_files' \
+ '(-1 --stdout)'{-1,--stdout}'[specify file for stdout redirection]:stdout file:_files' \
+ '(-2 --stderr)'{-2,--stderr}'[specify file for stderr redirection]:stderr file:_files' \
+ '(-x --pidfile)'{-x,--pidfile}'[optional path for .pid file written by application after fork()]:pid file:_files -g "*.pid(-.)"' \
+ '(-n --neverexits)'{-n,--neverexits}'[service should never exit by itself]' \
+ '(-O --preshutdown -o --shutdown)'{-O,--preshutdown}'[stop service application during system preshutdown]' \
+ '(-O --preshutdown -o --shutdown)'{-o,--shutdown}'[stop service application during system shutdown]' \
+ '(-i --interactive)'{-i,--interactive}'[allow service to interact with the desktop (No effect since Windows Vista/Longhorn)]' \
+ '(-j --nohide )'{-j,--nohide}"[don't hide console window when service interacts with desktop]" \
+ '(-V --verbose)'{-V,--verbose}'[when used with --query or --list, causes extra information to be printed]' \
'(- *)'{-h,--help}'[print help information]' \
- '(- *)'{-v,--version}'[print version information]' \
- '*: :_files'
+ '(- *)'{-v,--version}'[print version information]'
Index: Completion/Cygwin/Command/_cygserver
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_cygserver,v
retrieving revision 1.1
diff -u -r1.1 _cygserver
--- Completion/Cygwin/Command/_cygserver 7 Apr 2003 11:23:18 -0000 1.1
+++ Completion/Cygwin/Command/_cygserver 24 Jan 2009 13:39:31 -0000
@@ -1,13 +1,21 @@
#compdef cygserver cygserver.exe
-#Generated by Felix Rosencrantz
-local context state line
-typeset -A opt_args
-_arguments \
- '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threads to use]' \
+# cygwin 1.5.25
+
+_arguments -s -S \
+ '(--config-file -f)'{-f,--config-file}'[use specified file as config file (default /etc/cygserver.conf)]:config file:_files -g "*.conf(-.)"' \
+ '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threads to use (default 2)]:number of threads:' \
+ '(--process-cache -p)'{-p,--process-cache}'[size of process cache]:cache size:' \
+ '(--request-threads -r)'{-r,--request-threads}'[number of request threads to use (default 10)]:number of threads:' \
+ '(--debug -d)'{-d,--debug}'[log debug messages to stderr]' \
+ '(--stderr -e --no-stderr -E)'{-e,--stderr}'[log to stderr (default if stderr is a tty)]' \
+ '(--stderr -e --no-stderr -E)'{-E,--no-stderr}"[don't log to stderr (see -y, -Y options)]" \
+ '(--log-level -l)'{-l,--log-level}'[verbosity of logging (1..7) (default 6)]:verbosity level:({1..7})' \
+ '(--syslog -y --no-syslog -Y)'{-y,--syslog}'[log to syslog (default if stderr is no tty)]' \
+ '(--syslog -y --no-syslog -Y)'{-Y,--no-syslog}"[don't log to syslog (see -e, -E options)]" \
+ '(--no-sharedmem -m)'{-m,--no-sharedmem}"[don't start XSI Shared Memory support]" \
+ '(--no-msgqueues -q)'{-q,--no-msgqueues}"[don't start XSI Message Queue support]" \
+ '(--no-semaphores -s)'{-s,--no-semaphores}"[don't start XSI Semaphore support]" \
+ '(--shutdown -S)'{-S,--shutdown}'[shutdown the daemon]' \
'(--help -h)'{-h,--help}'[output usage information and exit]' \
- '(--request-threads -r)'{-r,--request-threads}'[number of request threads to use]' \
- '(--shutdown -s)'{-s,--shutdown}'[shutdown the daemon]' \
- '(--version -v)'{-v,--version}'[output version information and exit]' \
- '*: :_files'
-
+ '(--version -v)'{-v,--version}'[output version information and exit]'
Index: Completion/Cygwin/Command/_cygstart
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_cygstart,v
retrieving revision 1.2
diff -u -r1.2 _cygstart
--- Completion/Cygwin/Command/_cygstart 1 Jun 2005 10:02:33 -0000 1.2
+++ Completion/Cygwin/Command/_cygstart 24 Jan 2009 13:39:31 -0000
@@ -1,16 +1,15 @@
#compdef cygstart cygstart.exe
-#Generated by Felix Rosencrantz
-local context state line
-typeset -A opt_args
-_arguments \
- '(--action -a)'{-a,--action=-}':Use specified action instead of default:(open edit explore print find)' \
+# cygwin 1.5.25
+
+_arguments -s -S \
+ '(--action -a)'{-a,--action=-}'[use specified action instead of default]:action:(open edit explore print find)' \
'(--open -o)'{-o,--open}'[short for: --action open]' \
'(--explore -x)'{-x,--explore}'[short for: --action explore]' \
'(--edit -e)'{-e,--edit}'[short for: --action edit]' \
'(--find -f)'{-f,--find}'[short for: --action find]' \
'(--print -p)'{-p,--print}'[short for: --action print]' \
- '(--directory -d)'{-d,--directory=-}':Set working directory:_directories' \
+ '(--directory -d)'{-d,--directory=-}'[set working directory]:directory:_directories' \
'--hide[hides the window and activates another window]' \
'--maximize[maximizes the specified window]' \
'--minimize[minimizes the specified window and activates the next top-level window in the z-order]' \
@@ -22,9 +21,10 @@
'--showna[displays the window in its current state. The active window remains active]' \
'--shownoactivate[displays a window in its most recent size and position. The active window remains active]' \
'--shownormal[activates and displays a window. If the window is minimized or maximized, Windows restores it to its original size and position. An application should specify this flag when displaying the window for the first time]' \
- '(--help -?)'{'-?',--help}'[show this help message]' \
+ '(--help -?)'{-\?,--help}'[display help information]' \
'--usage[display brief usage message]' \
'--version[display version information]' \
'--license[display licensing information]' \
'--reference[open MSDN reference for ShellExecute]' \
- '*:program: _command_names -e:*::program arguments: _normal'
+ '1:file: _alternative "programs:program: _command_names -e" "files:file:_files" "urls:URL:_urls"' \
+ '*::program arguments: _normal'
Index: Completion/Cygwin/Command/_dumper
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_dumper,v
retrieving revision 1.1
diff -u -r1.1 _dumper
--- Completion/Cygwin/Command/_dumper 7 Apr 2003 11:23:18 -0000 1.1
+++ Completion/Cygwin/Command/_dumper 24 Jan 2009 13:39:31 -0000
@@ -1,13 +1,11 @@
#compdef dumper dumper.exe
-#Generated by Felix Rosencrantz
-local context state line
-typeset -A opt_args
-_arguments \
- '(--verbose -d)'{-d,--verbose}'[be verbose while dumping]' \
- '(--help -h)'{-h,--help}'[output help information and exit]' \
- '(--quiet -q)'{-q,--quiet}'[be quiet while dumping (default)]' \
- '(--version -v)'{-v,--version}'[output version information and exit]' \
- '1: :_file' \
+# cygwin 1.5.25
+
+_arguments -s -S \
+ '(--verbose -d --quiet -q)'{-d,--verbose}'[be verbose while dumping]' \
+ '(--verbose -d --quiet -q)'{-q,--quiet}'[be quiet while dumping (default)]' \
+ '(- 1 *)'{-h,--help}'[output help information and exit]' \
+ '(- 1 *)'{-v,--version}'[output version information and exit]' \
+ '1: :_files' \
'*: :_pids'
-
Index: Completion/Cygwin/Command/_getclip
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_getclip,v
retrieving revision 1.2
diff -u -r1.2 _getclip
--- Completion/Cygwin/Command/_getclip 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_getclip 24 Jan 2009 13:39:31 -0000
@@ -1,10 +1,12 @@
#compdef getclip getclip.exe
-#Generated by Felix Rosencrantz
-_arguments \
- '(--dos -d)'{-d,--dos}'[output text will have DOS line endings]' \
- '(--unix -u)'{-u,--unix}'[output text will have UNIX line endings]' \
- '(-)'{-\?,--help}'[show this help message]' \
+# cygutils 1.3.2
+
+_arguments -s -S \
+ '(--dos -d --unix -u --no-conv -n)'{-d,--dos}'[output text will have DOS line endings]' \
+ '(--dos -d --unix -u --no-conv -n)'{-u,--unix}'[output text will have UNIX line endings]' \
+ '(--dos -d --unix -u --no-conv -n)'{-n,--no-conv}'[do not translate line endings]' \
+ '(-)'{-\?,--help}'[display help information]' \
'(-)--usage[display brief usage message]' \
'(-)--version[display version information]' \
'(-)--license[display licensing information]'
Index: Completion/Cygwin/Command/_getfacl
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_getfacl,v
retrieving revision 1.2
diff -u -r1.2 _getfacl
--- Completion/Cygwin/Command/_getfacl 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_getfacl 24 Jan 2009 13:39:31 -0000
@@ -1,7 +1,8 @@
#compdef getfacl getfacl.exe
-#Generated by Felix Rosencrantz
-_arguments \
+# cygwin 1.5.25
+
+_arguments -s -S \
'(--all -a)'{-a,--all}'[display the filename, owner, group, and ACL of the file]' \
'(--dir -d)'{-d,--dir}'[display the filename, owner, group, and default ACL of the directory]' \
'(--noname -n)'{-n,--noname}'[display user and group IDs instead of names]' \
Index: Completion/Cygwin/Command/_mkshortcut
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_mkshortcut,v
retrieving revision 1.2
diff -u -r1.2 _mkshortcut
--- Completion/Cygwin/Command/_mkshortcut 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_mkshortcut 24 Jan 2009 13:39:31 -0000
@@ -1,15 +1,20 @@
#compdef mkshortcut mkshortcut.exe
-_arguments \
+# cygutils 1.3.2
+
+_arguments -s -S \
'(--arguments -a)'{-a,--arguments=-}'[use specified arguments]:arguments' \
+ '(--desc -d)'{-d,--desc=-}'[text for description/tooltip (defaults to POSIX path of TARGET)]:description' \
'(--icon -i)'{-i,--icon=-}'[specify icon file for link to use]:icon file:_files' \
'(--iconoffset -j)'{-j,--iconoffset=-}'[specify offset of icon in icon file]:offset' \
'(--name -n)'{-n,--name=-}'[specify name for link]:file:_files' \
+ '(--show -s)'{-s,--show=-}'[window to show: normal, minimized, maximized]:window state:(norm min max)' \
+ '(--workingdir -w)'{-w,--workingdir=-}'[set working directory (defaults to directory path of TARGET)]:working directory:_files -/' \
'(--allusers -A)'{-A,--allusers}"[use 'All Users' instead of current user for -D,-P]" \
- '(--desktop -D)'{-D,--desktop}"[create link relative to 'Desktop' directory]" \
- '(--smprograms -P)'{-P,--smprograms}"[create link relative to Start Menu 'Programs' directory]" \
- '(- 1)'{-h,--help}'[show help information]' \
+ '(--desktop -D --smprograms -P)'{-D,--desktop}"[create link relative to 'Desktop' directory]" \
+ '(--desktop -D --smprograms -P)'{-P,--smprograms}"[create link relative to Start Menu 'Programs' directory]" \
+ '(- 1)'{-h,--help}'[display help information]' \
'(- 1)--usage[display brief usage message]' \
- '(- 1)'{-v,--version}'[show version information]' \
+ '(- 1)'{-v,--version}'[display version information]' \
'(- 1)--license[display licensing information]' \
'1:target:_files'
Index: Completion/Cygwin/Command/_mkzsh
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_mkzsh,v
retrieving revision 1.1
diff -u -r1.1 _mkzsh
--- Completion/Cygwin/Command/_mkzsh 7 Apr 2003 11:23:18 -0000 1.1
+++ Completion/Cygwin/Command/_mkzsh 24 Jan 2009 13:39:31 -0000
@@ -1,10 +1,7 @@
#compdef mkzsh mkzsh.exe
-#Generated by Felix Rosencrantz
-local context state line
-typeset -A opt_args
-_arguments \
+_arguments -s -S \
'(--allusers -A)'{-A,--allusers}'[creates item for All Users instead of just current user]' \
'(--desktop -D)'{-D,--desktop}'[creates a Desktop icon for running /zsh.bat]' \
'(--smprograms -P)'{-P,--smprograms}'[creates a Program menu item for running /zsh.bat]' \
- '(--help -h)'{-h,--help}'[prints usage]'
+ '(--help -h)'{-h,--help}'[display help information]'
Index: Completion/Cygwin/Command/_putclip
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Cygwin/Command/_putclip,v
retrieving revision 1.2
diff -u -r1.2 _putclip
--- Completion/Cygwin/Command/_putclip 31 Jul 2003 15:26:14 -0000 1.2
+++ Completion/Cygwin/Command/_putclip 24 Jan 2009 13:39:31 -0000
@@ -1,10 +1,12 @@
#compdef putclip putclip.exe
-#Generated by Felix Rosencrantz
-_arguments \
- '(--dos -d)'{-d,--dos}'[clipboard text will have DOS line endings]' \
- '(--unix -u)'{-u,--unix}'[clipboard text will have UNIX line endings]' \
- '(-)'{'-?',--help}'[show this help message]' \
+# cygutils 1.3.2
+
+_arguments -s -S \
+ '(--dos -d --unix -u --no-conv -n)'{-d,--dos}'[clipboard text will have DOS line endings]' \
+ '(--dos -d --unix -u --no-conv -n)'{-u,--unix}'[clipboard text will have UNIX line endings]' \
+ '(--dos -d --unix -u --no-conv -n)'{-n,--no-conv}'[do not translate line endings]' \
+ '(-)'{-\?,--help}'[display help information]' \
'(-)--usage[display brief usage message]' \
'(-)--version[display version information]' \
'(-)--license[display licensing information]'
Index: Completion/Cygwin/Command/_readshortcut
===================================================================
RCS file: Completion/Cygwin/Command/_readshortcut
diff -N Completion/Cygwin/Command/_readshortcut
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Completion/Cygwin/Command/_readshortcut 24 Jan 2009 13:39:32 -0000
@@ -0,0 +1,21 @@
+#compdef readshortcut readshortcut.exe
+
+# cygutils 1.3.2
+
+_arguments -s -S \
+ '(--fields -f)'{-f,--fields}'[show field names]' \
+ '(--unix -u --windows -w)'{-u,--unix}'[use Unix path format for display (default)]' \
+ '(--unix -u --windows -w)'{-w,--windows}'[use Windows path format for display ]' \
+ '(--target -t)'{-t,--target}'[display shortcut target]' \
+ '(--working -g)'{-g,--working}'[display shortcut working directory]' \
+ '(--args -r)'{-r,--args}'[display shortcut arguments]' \
+ '(--showcmd -s)'{-s,--showcmd}'[display shortcut "show" command value]' \
+ '(--icon -i)'{-i,--icon}'[display icon library location]' \
+ '(--offset -j)'{-j,--offset}'[display icon library offset]' \
+ '(--desc -d)'{-d,--desc}'[display shortcut description]' \
+ '(--all -a)'{-a,--all}'[display all information]' \
+ '(- 1)'{-h,--help}'[display help information]' \
+ '(- 1)--usage[display brief usage message]' \
+ '(- 1)'{-v,--version}'[display version information]' \
+ '(- 1)--license[display licensing information]' \
+ '1:shortcut:_files -g "*.lnk(-.)"'
Index: Completion/Cygwin/Command/_setfacl
===================================================================
RCS file: Completion/Cygwin/Command/_setfacl
diff -N Completion/Cygwin/Command/_setfacl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Completion/Cygwin/Command/_setfacl 24 Jan 2009 13:39:32 -0000
@@ -0,0 +1,13 @@
+#compdef setfacl setfacl.exe
+
+# cygwin 1.5.25
+
+_arguments -s -S \
+ '(-d, --delete)'{-d,--delete}'[delete one or more specified ACL entries]:ACL entry:' \
+ '(-f, --file)'{-f,--file}'[set ACL entries for FILE to ACL entries read from a ACL_FILE]:ACL file:_files' \
+ '(-m, --modify)'{-m,--modify}'[modify one or more specified ACL entries]:ACL entry:' \
+ '(-r, --replace)'{-r,--replace}'[replace mask entry with maximum permissions needed for the file group class]' \
+ '(-s, --substitute)'{-s,--substitute}'[substitute specified ACL entries for the \[ACL of FILE\]]:ACL entry:' \
+ '(- *)'{-h,--help}'[output usage information and exit]' \
+ '(- *)'{-v,--version}'[output version information and exit]' \
+ '*: :_files'
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: PATCH: update Cygwin completion functions
2009-01-24 13:53 PATCH: update Cygwin completion functions Doug Kearns
@ 2009-01-25 13:39 ` Clint Adams
2009-01-26 8:06 ` Doug Kearns
0 siblings, 1 reply; 4+ messages in thread
From: Clint Adams @ 2009-01-25 13:39 UTC (permalink / raw)
To: Doug Kearns; +Cc: zsh-workers
On Sun, Jan 25, 2009 at 12:53:12AM +1100, Doug Kearns wrote:
> This updates the Cygwin related completion functions for the latest
> versions of those commands, fixes a few bugs, and adds rudimentary
> completion for setfacl and readshortcut.
What do get/setfacl --version return? We might want to use _pick_variant
and cover at least the SGI versions.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: PATCH: update Cygwin completion functions
2009-01-25 13:39 ` Clint Adams
@ 2009-01-26 8:06 ` Doug Kearns
2009-01-29 16:24 ` Clint Adams
0 siblings, 1 reply; 4+ messages in thread
From: Doug Kearns @ 2009-01-26 8:06 UTC (permalink / raw)
To: zsh-workers
On 1/26/09, Clint Adams <clint@zsh.org> wrote:
> On Sun, Jan 25, 2009 at 12:53:12AM +1100, Doug Kearns wrote:
> > This updates the Cygwin related completion functions for the latest
> > versions of those commands, fixes a few bugs, and adds rudimentary
> > completion for setfacl and readshortcut.
>
>
> What do get/setfacl --version return? We might want to use _pick_variant
> and cover at least the SGI versions.
% setfacl --version
setfacl (cygwin) 1.13
ACL Modification Utility
Copyright 2000, 2001, 2002 Red Hat, Inc.
Compiled on Jun 12 2008
Regards,
Doug
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: PATCH: update Cygwin completion functions
2009-01-26 8:06 ` Doug Kearns
@ 2009-01-29 16:24 ` Clint Adams
0 siblings, 0 replies; 4+ messages in thread
From: Clint Adams @ 2009-01-29 16:24 UTC (permalink / raw)
To: Doug Kearns; +Cc: zsh-workers
On Mon, Jan 26, 2009 at 07:06:33PM +1100, Doug Kearns wrote:
> % setfacl --version
> setfacl (cygwin) 1.13
> ACL Modification Utility
> Copyright 2000, 2001, 2002 Red Hat, Inc.
> Compiled on Jun 12 2008
Thanks.
Index: Completion/Unix/Command/_getfacl
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_getfacl,v
retrieving revision 1.3
diff -u -r1.3 _getfacl
--- Completion/Unix/Command/_getfacl 29 Jan 2009 16:06:48 -0000 1.3
+++ Completion/Unix/Command/_getfacl 29 Jan 2009 16:23:20 -0000
@@ -1,7 +1,7 @@
#compdef getfacl getfacl.exe
+if _pick_variant cygwin=cygwin unix --version; then
# cygwin 1.5.25
-
_arguments -s -S \
'(--all -a)'{-a,--all}'[display the filename, owner, group, and ACL of the file]' \
'(--dir -d)'{-d,--dir}'[display the filename, owner, group, and default ACL of the directory]' \
@@ -9,3 +9,20 @@
'(- *)'{-h,--help}'[display help information]' \
'(- *)'{-v,--version}'[display version information]' \
'*: :_files'
+else
+_arguments -s -S \
+ '--access[display the file access control list only]' \
+ '(-d --default)'{-d,--default}'[display the default access control list only]' \
+ '--omit-header[do not display the comment header]' \
+ '--all-effective[print all effective rights]' \
+ '--no-effective[print no effective rights] '\
+ '--skip-base[skip files that only have the base entries]' \
+ '(-R --recursive)'{-R,--recursive}'[recurse into subdirectories]' \
+ '(-L --logical)'{-L,--logical}'[logical walk, follow symbolic links]' \
+ '(-P --physical)'{-P,--physical}'[physical walk, do not follow symbolic links]' \
+ '--tabular[use tabular output format]' \
+ '--numeric[print numeric user/group identifiers]' \
+ '--absolute-names[don'"'"'t strip leading '"'"'/'"'"' in pathnames' \
+ '--version[print version and exit]' \
+ '--help[this help text]'
+fi
Index: Completion/Unix/Command/_setfacl
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_setfacl,v
retrieving revision 1.1
diff -u -r1.1 _setfacl
--- Completion/Unix/Command/_setfacl 29 Jan 2009 16:02:54 -0000 1.1
+++ Completion/Unix/Command/_setfacl 29 Jan 2009 16:23:20 -0000
@@ -1,7 +1,7 @@
#compdef setfacl setfacl.exe
+if _pick_variant cygwin=cygwin unix --version; then
# cygwin 1.5.25
-
_arguments -s -S \
'(-d, --delete)'{-d,--delete}'[delete one or more specified ACL entries]:ACL entry:' \
'(-f, --file)'{-f,--file}'[set ACL entries for FILE to ACL entries read from a ACL_FILE]:ACL file:_files' \
@@ -11,3 +11,24 @@
'(- *)'{-h,--help}'[output usage information and exit]' \
'(- *)'{-v,--version}'[output version information and exit]' \
'*: :_files'
+else
+_arguments -s -S \
+ '(-m --modify)'{-m,--modify=}'[modify the current ACL]:ACL:' \
+ '(-M --modify-file)'{-M,--modify-file=}'[read ACL entries to modify from file]:file:_files' \
+ '(-x --remove)'{-x,--remove=}'[remove ACL entries]:ACL:' \
+ '(-X --remove-file)'{-X,--remove-file=}'[read ACL entries to remove from file]:file:_files' \
+ '(-b --remove-all)'{-b,--remove-all}'[remove all extended ACL entries]' \
+ '(-k --remove-default)'{-k,--remove-default}'[remove the default ACL]' \
+ '--set=[set the ACL, replacing the current ACL]:ACL:' \
+ '--set-file=[read ACL entries to set from file]:file:_files' \
+ '--mask[do recalculate the effective rights mask]' \
+ '(-n --no-mask)'{-n,--no-mask}'[don'"'"'t recalculate the effective rights mask]' \
+ '(-d --default)'{-d,--default}'[operations apply to the default ACL]' \
+ '(-R --recursive)'{-R,--recursive}'[recurse into subdirectories]' \
+ '(-L --logical)'{-L,--logical}'[logical walk, follow symbolic links]' \
+ '(-P --physical)'{-P,--physical}'[physical walk, do not follow symbolic links]' \
+ '--restore=[restore ACLs]:file:_files' \
+ '--test[test mode (ACLs are not modified)]' \
+ '--version[print version and exit]' \
+ '--help[this help text]'
+fi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-29 16:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-24 13:53 PATCH: update Cygwin completion functions Doug Kearns
2009-01-25 13:39 ` Clint Adams
2009-01-26 8:06 ` Doug Kearns
2009-01-29 16:24 ` Clint Adams
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).