diff options
Diffstat (limited to 'Completion/Debian/Command')
| -rw-r--r-- | Completion/Debian/Command/_apt | 16 | ||||
| -rw-r--r-- | Completion/Debian/Command/_auto-apt | 31 | ||||
| -rw-r--r-- | Completion/Debian/Command/_dak | 2 | ||||
| -rw-r--r-- | Completion/Debian/Command/_debfoster | 11 | ||||
| -rw-r--r-- | Completion/Debian/Command/_dpkg_source | 28 | ||||
| -rw-r--r-- | Completion/Debian/Command/_git-buildpackage | 43 | ||||
| -rw-r--r-- | Completion/Debian/Command/_invoke-rc.d | 4 | ||||
| -rw-r--r-- | Completion/Debian/Command/_module-assistant | 3 | ||||
| -rw-r--r-- | Completion/Debian/Command/_update-alternatives | 6 | ||||
| -rw-r--r-- | Completion/Debian/Command/_update-rc.d | 16 |
10 files changed, 58 insertions, 102 deletions
diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt index 19c2dfc8c..01d8282d1 100644 --- a/Completion/Debian/Command/_apt +++ b/Completion/Debian/Command/_apt @@ -468,7 +468,9 @@ _apt-cmd () { /$'full-upgrade\0'/ \| \ /$'dist-upgrade\0'/ \| \ /$'edit-sources\0'/ /$'[^\0]#\0'/ ': ::_apt_sources' \# \| \ - /"[]"/ ':argument-1::compadd "$expl_action[@]" list search showsrc show depends rdepends policy update install reinstall download source build-dep remove upgrade full-upgrade dist-upgrade edit-sources autoclean changelog autopurge autoremove purge why why-not' + /$'history-list\0'/ \| \ + /$'(history-(info|redo|undo|rollback))\0'/ /$'[^\0]#\0'/ ': ::_apt_history_ids' \# \| \ + /"[]"/ ':argument-1::compadd "$expl_action[@]" list search showsrc show depends rdepends policy update install reinstall download source build-dep remove upgrade full-upgrade dist-upgrade edit-sources autoclean changelog autopurge autoremove purge why why-not history-list history-info history-redo history-undo history-rollback' _apt-cmd () { local expl_action expl_packages subcmd @@ -490,12 +492,15 @@ _apt-get () { -d,--download-only:bool \ -f,--fix-broken:bool \ -h,--help:bool \ + --assume-no:bool \ + -a,--host-architecture:bool \ + -P,--build-profiles:bool \ -m,--ignore-missing,--fix-missing:bool \ -o,--option:arbitem \ -q,--quiet,--silent:intlevel \ -s,--simulate,--just-print,--dry-run,--recon,--no-act:bool \ -t,--target-release,--default-release:release \ - -u,--show-upgraded:bool \ + --no-show-upgraded:bool \ -v,--version:bool \ -y,--yes,--assume-yes:bool \ --allow-change-held-packages:bool \ @@ -513,6 +518,7 @@ _apt-get () { --no-download:bool \ --no-install-recommends:bool \ --no-remove:bool \ + --install-suggests:bool \ --no-upgrade:bool \ --only-source:bool \ --only-upgrade:bool \ @@ -793,4 +799,10 @@ _apt_snapshot_dates() { _wanted list expl 'wayback date (yyyymmdd[ThhmmssZ])' compadd -- $dates } +_apt_history_ids() { + local -a expl historyids + historyids=( ${${${(f)"$(_call_program history-ids apt history-list)"}:#ID*}%% *} ) + _wanted history-ids expl 'history id' compadd -o numeric,reverse -a historyids +} + _apt "$@" diff --git a/Completion/Debian/Command/_auto-apt b/Completion/Debian/Command/_auto-apt deleted file mode 100644 index 2e6dccbc1..000000000 --- a/Completion/Debian/Command/_auto-apt +++ /dev/null @@ -1,31 +0,0 @@ -#compdef auto-apt - -local expl prev="$words[CURRENT-1]" - -# if there is a command in arguments ? -if [[ -n $words[(r)(run|update|update-local|merge|del|check|list|search|debuilt|status)] ]] ; then - - # yes, add completion for command arguments and command options - if [[ -n $words[(r)(update|update-local|merge)] && "$words[CURRENT]" = -* ]] ; then - _wanted option expl 'option' compadd - "-a" && return; - fi - - if [[ -n $words[(r)(check|list|search)] && "$words[CURRENT]" = -* ]] ; then - _wanted option expl 'option' compadd - "-v" "-f" && return; - fi - - case $prev in - run) _wanted command expl 'command' _files -g '*(/,*)' && return ;; - del) _wanted package expl 'package' _deb_packages avail && return ;; - esac -else - _arguments \ - '-a:distribution:_values -s , distribution main contrib non-free non-US none' \ - '-p:hook:_values -s , hook exec open access stat none' \ - '-D:dbfile:_files' \ - '-F:filedb:_files' \ - -h -s -y -q -i -X -x -L \ - '*:command:(run update update-local merge del check list search debuild status)' && return -fi - -return 1 diff --git a/Completion/Debian/Command/_dak b/Completion/Debian/Command/_dak index 9976c7371..0c1d82f84 100644 --- a/Completion/Debian/Command/_dak +++ b/Completion/Debian/Command/_dak @@ -37,7 +37,7 @@ case $cmd in '(-n --no-action)'{-n,--no-action}'[do not do anything]' '(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable experimental' ':package:_deb_packages avail' - ':section:(admin base comm contrib/admin contrib/comm contrib/devel contrib/doc contrib/games contrib/graphics contrib/interpreters contrib/kde contrib/libdevel contrib/libs contrib/mail contrib/math contrib/misc contrib/net contrib/otherosfs contrib/perl contrib/python contrib/science contrib/sound contrib/tex contrib/text contrib/utils contrib/web contrib/x11 devel doc editors electronics embedded games gnome graphics hamradio interpreters kde libdevel libs mail math misc net news non-free/admin non-free/base non-free/comm non-free/devel non-free/doc non-free/editors non-free/electronics non-free/games non-free/graphics non-free/hamradio non-free/libdevel non-free/libs non-free/mail non-free/math non-free/misc non-free/net non-free/news non-free/otherosfs non-free/python non-free/science non-free/sound non-free/tex non-free/text non-free/utils non-free/web non-free/x11 oldlibs otherosfs perl python science shells sound tex text utils web x11)' + ':section:({,contrib/,non-free/}{admin,cli-mono,comm,database,debug,devel,doc,editors,education,electronics,embedded,fonts,games,gnome,gnu-r,gnustep,graphics,hamradio,haskell,httpd,interpreters,introspection,java,javascript,kde,kernel,libdevel,libs,lisp,localization,mail,math,metapackages,misc,net,news,ocaml,oldlibs,otherosfs,perl,php,python,ruby,rust,science,shells,sound,tex,text,utils,vcs,video,web,x11,xfce,zope})' ':priority:(extra important optional required standard)' ) ;; diff --git a/Completion/Debian/Command/_debfoster b/Completion/Debian/Command/_debfoster index 08a1078e2..3e2231d73 100644 --- a/Completion/Debian/Command/_debfoster +++ b/Completion/Debian/Command/_debfoster @@ -44,10 +44,13 @@ if [[ -n "$state" ]]; then ;; *(#i)(no|)keepsections*) _wanted values expl 'section' compadd \ - x11 web utils text tex sound shells science \ - otherosfs oldlibs news net misc math mail libs \ - interpreters hamradio graphics games electronics \ - editors doc devel comm base admin && ret=0 + zope xfce x11 web video vcs utils text tex sound shells \ + science rust ruby python php perl otherosfs oldlibs ocaml \ + news net misc metapackages math mail localization lisp libs \ + libdevel kernel kde javascript java introspection \ + interpreters httpd haskell hamradio graphics gnustep gnu-r \ + gnome games fonts embedded electronics education editors doc \ + devel debug database comm cli-mono admin && ret=0 ;; *(#i)guessdepends*) _wanted values expl 'name extension' \ diff --git a/Completion/Debian/Command/_dpkg_source b/Completion/Debian/Command/_dpkg_source index eabe8bc33..379ad39a7 100644 --- a/Completion/Debian/Command/_dpkg_source +++ b/Completion/Debian/Command/_dpkg_source @@ -1,16 +1,32 @@ #compdef dpkg-source _arguments \ - '-x[specify source file]:Debian source file:_files -g "*.dsc(-.)"' \ - '-b[specify source directory]:Debian source directory:_files -/' \ + '(-x --extract)'{-x,--extract}'[specify source file]:Debian source file:_files -g "*.dsc(-.)"::output directory:_directories' \ + '(-b --build)'{-b,--build}'[specify source directory]:Debian source directory:_files -/' \ + '--print-format[print the format to be used for the source package]: :_directories' \ + '--before-build[run the corresponding source package format hook]: :_directories' \ + '--after-build[run the corresponding source package format hook]: :_directories' \ + '--commit[store upstream changes in a new patch]: :_directories::patch name' \ '-c-[control file]:control file:_files' \ '-l-[changelog file]:changelog file:_files' \ '-F-[changelog format]:changelog format:' \ + '--format=[set the format to be used for the source package]:format' \ '-V-[set substitutions variable]:expression:' \ '-T-[alternate variable file]:varlistfile:' \ '-D-[override dsc field]:expression:' \ '-U-[remove a field]:field:' \ - '-i-[ignore files in diff]:filter:' \ + '(-i --diff-ignore)'{-i-,--diff-ignore=}'[filter out files to ignore diffs of]:regex' \ + '--extend-diff-ignore=:regex' \ + '(-I --tar-ignore)'{-I-,--tar-ignore=}'[filter out files when building tarballs]:regex' \ + '(-Z --compression)'{-Z-,--compression=}'[select compression to use]:compression [xz]:(bzip2 gzip lzma xz)' \ + '(-z --compression-level)'{-z-,--compression-level=}'[compression level to use]:level [9]' \ + "--no-copy[don't copy .orig tarballs]" \ + "--no-check[don't check signature and checksums before unpacking]" \ + "--no-overwrite-dir[don't overwrite directory on extraction]" \ + "--require-valid-signature[abort if the package doesn't have a valid signature]" \ + '--require-strong-checksums[abort if the package contains no strong checksums]' \ + '--ignore-bad-version[allow bad source package versions]' \ + '--threads-max=[set maximum number of threads for compressors]:threads' \ '-sa[autoselect orig source]' \ '-sk[use packaged orig source - unpack and keep]' \ '-sp[use packaged orig source - unpack and remove]' \ @@ -19,10 +35,14 @@ _arguments \ '-ss[trust packed and unpacked source are the same]' \ '-sn[no diff, do main tarfile only]' \ '-sA[autoselect orig source with overwrite]' \ + '--abort-on-upstream-changes' \ '-sK[use packaged orig source - unpack and keep with overwrite]' \ '-sP[use packaged orig source - unpack and remove with overwrite]' \ '-sU[use unpackaged orig source - unpack and keep with overwrite]' \ '-sR[use unpackaged orig source - unpack and remove with overwrite]' \ '-sp[leave original source packed in cwd]' \ '-su[unpack original source tree too]' \ - '-h[help]' + "--skip-debianization[don't apply debian diff to upstream sources]" \ + '(-)'{-\?,--help}'[display help information]' \ + '-q[quiet mode]' \ + '--version[display version information]' diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage deleted file mode 100644 index 81bf7dac9..000000000 --- a/Completion/Debian/Command/_git-buildpackage +++ /dev/null @@ -1,43 +0,0 @@ -#compdef git-buildpackage -#description build Debian packages from a git repository - -_arguments \ - '--version[show program version number and exit]' \ - '--help[show help message and exit]' \ - '--git-ignore-new[build with uncommitted changes in the source tree]' \ - '--git-no-ignore-new[negates --git-ignore-new]' \ - '--git-verbose[verbose command execution]' \ - '--git-tag[create a tag after a successful build]' \ - '--git-tag-only[do not build, only tag and run the posttag hook]' \ - '--git-retag[do not fail if the tag already exists]' \ - '--git-sign-tags[sign tags]' \ - '--git-no-sign-tags[negates --git-sign-tags]' \ - '--git-keyid=-[GPG keyid to sign tags with]:GPG key:' \ - '--git-debian-tag=-[format string for debian tags]:format string [debian/%%(version)s]' \ - '--git-upstream-tag=-[format string for upstream tags]:format string [upstream/%%(version)s]' \ - '--git-pristine-tar[use pristine-tar to create .orig.tar.gz]' \ - '--git-no-pristine-tar[negates --git-pristine-tar]' \ - '--git-force-create[force creation of orig.tar.gz]' \ - '--git-no-create-orig[do not create orig.tar.gz]' \ - '--git-tarball-dir=-[location to look for external tarballs]:tarball directory:_files -/' \ - '--git-compression=-[compression type]:compression type [auto]:(auto gzip bzip2 lzma xz)' \ - '--git-compression-level=-[set compression level]:level:(1 2 3 4 5 6 7 8 9)' \ - '--git-upstream-branch=-[upstream branch]::' \ - '--git-debian-branch=-[branch the Debian package is being developed on]::' \ - '--git-ignore-branch[build although debian-branch != current branch]' \ - '--git-no-ignore-branch[negates --git-ignore-branch]' \ - '--git-builder=-[command to build the Debian package]:command:' \ - '--git-cleaner=-[command to clean the working copy]:command:' \ - '--git-prebuild=-[command to run before a build]:command:' \ - '--git-postbuild=-[hook run after a successful build]:command:' \ - '--git-posttag=-[hook run after a successful tag operation]:command:' \ - '--git-pbuilder[invoke git-pbuilder for building]' \ - '--git-no-pbuilder[negates --git-pbuilder]' \ - '--git-dist=-[build for this distribution when using git-pbuilder]:distribution:' \ - '--git-arch=-[build for this architecture when using git-pbuilder]:architecture:' \ - '--git-export-dir=-[before building the package export the source into this directory]:directory:_files -/' \ - '--git-export=-[export treeish object instead of HEAD]:treeish:' \ - '--git-dont-purge[retain exported package build directory]' \ - '--git-overlay[extract orig tarball when using export-dir option]' \ - '--git-no-overlay[negates --git-overlay]' \ - '*:other options:_dpkg-buildpackage' diff --git a/Completion/Debian/Command/_invoke-rc.d b/Completion/Debian/Command/_invoke-rc.d index cd8df28c1..74ee1e828 100644 --- a/Completion/Debian/Command/_invoke-rc.d +++ b/Completion/Debian/Command/_invoke-rc.d @@ -1,11 +1,13 @@ #compdef invoke-rc.d _arguments \ + '(- 1 2)--help[display help information]' \ '--quiet[quiet mode, no error messages are generated]' \ '--force[run the initscript regardless of policy and subsystem]' \ '--try-anyway[run the initscript even if a non-fatal error is found]' \ '--disclose-deny[return 101 instead of 0 if action is denied]' \ '--query[return one of status codes 100-106, does not run the script]' \ '--no-fallback[ignore any fallback action requests by the policy layer]' \ + '--skip-systemd-native[exit before doing anything if a systemd environment is detected]' \ '1:service:_services' \ - '2:command:(start stop force-stop restart reload force-reload status)' + '2:command:(start stop force-stop restart try-restart reload force-reload status)' diff --git a/Completion/Debian/Command/_module-assistant b/Completion/Debian/Command/_module-assistant index b2c1e56ee..27c06bc5b 100644 --- a/Completion/Debian/Command/_module-assistant +++ b/Completion/Debian/Command/_module-assistant @@ -20,7 +20,7 @@ _module_assistant_commands=( 'purge[clear cache and remove all binary packages of source package]' ) -_arguments -A \ +_arguments -s -S : \ '(-h --help)'{-h,--help}'[print help screen]' \ '(-v --verbose)'{-v,--verbose}'[be verbose, show full paths, etc.]' \ '(-q --quiet)'{-q,--quiet}'[the opposite of verbose]' \ @@ -34,4 +34,3 @@ _arguments -A \ '(-t --text-mode)'{-t,--text-mode}'[no progress bars]' \ '1:list of commands:_values -s , subcommands "${_module_assistant_commands[@]}"' \ '*:package: compadd /usr/src/modass/var_cache_modass/*.avail_version(N:t:r) /var/cache/modass/*.avail_version(N:t:r)' - diff --git a/Completion/Debian/Command/_update-alternatives b/Completion/Debian/Command/_update-alternatives index 31128dd82..0ddb8748d 100644 --- a/Completion/Debian/Command/_update-alternatives +++ b/Completion/Debian/Command/_update-alternatives @@ -14,8 +14,10 @@ _arguments -C \ '--test' \ '--help' \ '--version' \ - '--altdir:altdir:_files -/' \ - '--admindir:admindir:_files -/' \ + '--altdir:alternatives directory [/etc/alternatives]:_files -/' \ + "--admindir:administrative directory [$alterdir]:_files -/" \ + '--instdir:installation directory:_files -/' \ + '--root:root directory:_files -/' \ '--log:log file:_files -/' \ '--force' \ '--skip-auto' \ diff --git a/Completion/Debian/Command/_update-rc.d b/Completion/Debian/Command/_update-rc.d index 68b81dc72..d1941a384 100644 --- a/Completion/Debian/Command/_update-rc.d +++ b/Completion/Debian/Command/_update-rc.d @@ -3,26 +3,18 @@ local curcontext="$curcontext" state line expl _arguments -C \ - '-n[show actions without performing them]' \ '-f[force removal of symlinks]' \ '1:service:_services' \ - '2:command:(remove defaults start stop)' \ + '2:command:(remove defaults defaults-disabled disable enable)' \ '*::args:->args' && return case $words[2] in - defaults) - _message -e number 'sequence number' + disable|enable) + _wanted runlevels expl runlevel S 2 3 4 5 && return ;; - remove) + *) _message 'no more arguments' ;; - st*) - case ${words[CURRENT-1]} in - .) _wanted commands expl commands compadd start stop && return ;; - start|stop) _message -e number 'sequence number' ;; - *) _message -e runlevels run\ level ;; - esac - ;; esac return 1 |