tidy up of many completions (updates, fixes, improvements and plain aesthetics)

1 files changed, 22 insertions, 36 deletions

diff --git a/Completion/Cygwin/Command/_cygrunsrv b/Completion/Cygwin/Command/_cygrunsrv
index 08c23058e..725ac46a0 100644
--- a/Completion/Cygwin/Command/_cygrunsrv
+++ b/Completion/Cygwin/Command/_cygrunsrv
@@ -1,39 +1,25 @@
 #compdef cygrunsrv cygrunsrv.exe
-#Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments  \
-  '(--install -I)'{-I,--install}':Installes a new service named <svc_name>.:->svc_name' \
-  '(--remove -R)'{-R,--remove}':Removes a service named <svc_name>.:->svc_name' \
-  '(--start -S)'{-S,--start}':Starts a service named <svc_name>.:->svc_name' \
-  '(--stop -E)'{-E,--stop}':Stops a service named <svc_name>.:->svc_name' \
-  '(--path -p)'{-p,--path}':Application path which is run as a service.:->app_path' \
-  '(--args -a)'{-a,--args}':Optional string with command line options which is given to the service application on startup.:->args' \
-  '(--chdir -c)'{-c,--chdir}':Optional directory which will be used as working directory for the application.:_directories' \
-  '(--env -e)'{-e,--env}':Optional environment strings which are added to the environment when service is started. You can add up to 255 environment strings using:->VAR=VALUE' \
-  '(--disp -d)'{-d,--disp}':Optional string which contains the display name of the service. Defaults to service name.:->display_name' \
-  '(--desc -f)'{-f,--desc}':Optional string which contains the service description.:->description' \
-  "(--type -t)"{-t,--type}"[Optional start type of service. Defaults to 'auto'.]: :(auto manual)" \
-  '(--user -u)'{-u,--user}':Optional user name to start service as. Defaults to SYSTEM account.:_users' \
-  '(--passwd -w)'{-w,--passwd}':Optional password for user. Only needed if a user is given. If a user has an empty:->password' \
-  '(--termsig -s)'{-s,--termsig}':Optional signal to send to service application when service is stopped. <signal> can be a number or a signal name such as HUP, INT, QUIT, etc. Default is TERM.:_signals' \
-  '(--dep -y)'{-y,--dep}':Optional name of service that must be started:->svc_name2' \
-  '(--stdin -0)'{-0,--stdin}':Optional input file used for stdin redirection. Default is /dev/null.:_files' \
-  '(--stdout -1)'{-1,--stdout}':Optional output file used for stdout redirection. Default is /var/log/<svc_name>.log.:_files' \
-  '(--stderr -2)'{-2,--stderr}':Optional output file used for stderr redirection. Default is /var/log/<svc_name>.log.:_files' \
-  '(--shutdown -o)'{-o,--shutdown}'[Stop service application during system shutdown.]' \
-  '(--help -h)'{-h,--help}'[print this help, then exit.]' \
-  '(--version -v)'{-v,--version}'[print cygrunsrv program version number, then exit.]' \
-  '*: :_files'  && return 0
-            
-case $state in
-  "VAR=VALUE");;
-  "app_path");;
-  "args");;
-  "description");;
-  "display_name");;
-  "password");;
-  "svc_name");;
-  "svc_name2");;
-esac
+  '(-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' \
+  '(-p --path)'{-p,--path}'[specify application path which is run as a service]:application path' \
+  '(-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' \
+  '(-d --disp)'{-d,--disp}'[specify display name for service]:display name' \
+  '(-f --desc)'{-f,--desc}'[specify service description]:description' \
+  '(-t --type)'{-t,--type}'[specify service start type]:start type:(auto manual)' \
+  '(-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' \
+  '(-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]' \
+  '(- *)'{-h,--help}'[print help information]' \
+  '(- *)'{-v,--version}'[print version information]' \
+  '*: :_files'