From 07a50d57a2369824b2934b5d6f0aba642b631358 Mon Sep 17 00:00:00 2001 From: Christopher Bock Date: Sat, 12 Apr 2025 13:20:15 +0200 Subject: [PATCH] github #131: completion: minor updates _apt-file: add list-indices (wording tweaked by dana) _bug: update bts backends from `reportbug --bts help` output _debsnap: complete -l as --list _deb_architectures: update archs (source: popcon) _losetup: remove "--delete" _rsync: add PROGRESS2 to --info _x_utils: add eventtype "button" --- ChangeLog | 9 +++++++++ Completion/Debian/Command/_apt-file | 3 ++- Completion/Debian/Command/_bug | 2 +- Completion/Debian/Command/_debsnap | 2 +- Completion/Debian/Type/_deb_architectures | 6 +++--- Completion/Linux/Command/_losetup | 2 +- Completion/Unix/Command/_rsync | 2 +- Completion/X/Command/_x_utils | 2 +- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index db2f4777a..dd914b405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2025-06-05 dana + * Christopher Bock: github #131: + Completion/Debian/Command/_apt-file, + Completion/Debian/Command/_bug, + Completion/Debian/Command/_debsnap, + Completion/Debian/Type/_deb_architectures, + Completion/Linux/Command/_losetup, + Completion/Unix/Command/_rsync, Completion/X/Command/_x_utils: + minor updates + * Christopher Bock: github #131: Completion/Debian/Command/_wanna-build: remove wanna-build diff --git a/Completion/Debian/Command/_apt-file b/Completion/Debian/Command/_apt-file index 5b24707d2..1ed9e3379 100644 --- a/Completion/Debian/Command/_apt-file +++ b/Completion/Debian/Command/_apt-file @@ -28,6 +28,7 @@ case $state in 'update:resynchronize package contents' {find,search}:'search in which package file is included' {list,show}:'list contents of a package' + 'list-indices:list known content indices' 'purge:remove all Contents-.gz files in cache directory' ) _describe -t commands 'apt-list command' cmds @@ -46,7 +47,7 @@ case $state in list|show) _deb_packages avail ;; - update|purge) + update|purge|list-indices) # do nothing ;; *) diff --git a/Completion/Debian/Command/_bug b/Completion/Debian/Command/_bug index 436d294f9..2752482ca 100644 --- a/Completion/Debian/Command/_bug +++ b/Completion/Debian/Command/_bug @@ -10,7 +10,7 @@ _bug_commonargs=( ) _rb_commonargs=( - '(-B --bts)'{-B,--bts=}'[use alternate BTS]:system:(debian gnome kde tdyc kde-debian)' + '(-B --bts)'{-B,--bts=}'[use alternate BTS]:system:(debian ubuntu guug default Grml)' '(-l --ldap)'{-l,--ldap}'[enable LDAP support]' '(-l --ldap)--no-ldap[disable LDAP support]' '(--proxy --http_proxy)'--{http_,}'proxy=:proxy host:_hosts' diff --git a/Completion/Debian/Command/_debsnap b/Completion/Debian/Command/_debsnap index b9393cac4..40fc0eb57 100644 --- a/Completion/Debian/Command/_debsnap +++ b/Completion/Debian/Command/_debsnap @@ -10,7 +10,7 @@ _arguments \ '(-d --destdir)'{-d+,--destdir=}'[set download directory]:download directory:_files -/' \ '(-f --force)'{-f,--force}'[allow non-empty destination directory]' \ '(-v --verbose)'{-v,--verbose}'[print configuration and report progress]' \ - --list"[list versions; don't download]" \ + '(-l --list)'{-l,--list}"[list versions; don't download]" \ --binary'[operate on binary packages (default: source packages)]' \ '*'{-a+,--architecture=}'[specify architectures to download]:architecture to download:_deb_architectures' \ --first='[download all versions newer than this]:version number (lower bound):->versions' \ diff --git a/Completion/Debian/Type/_deb_architectures b/Completion/Debian/Type/_deb_architectures index 1429112a8..85bd7b23f 100644 --- a/Completion/Debian/Type/_deb_architectures +++ b/Completion/Debian/Type/_deb_architectures @@ -4,6 +4,6 @@ local extra expl zparseopts -E -D -a extra a: _description architectures expl 'architecture' -compadd "$@" "$expl[@]" alpha amd64 arm64 armel armhf hppa hurd-i386 i386 ia64 \ - kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe ppc64 \ - ppc64el s390x sh4 sparc sparc64 x32 ${=extra[2]} +compadd "$@" "$expl[@]" alpha amd64 arm arm64 armel armhf hppa hurd-i386 i386 \ + ia64 kfreebsd-amd64 loong64 loongarch6 m68k mips mips64el mipsel powerpc \ + ppc64 ppc64el riscv64 s390x sh4 sparc sparc64 x32 ${=extra[2]} diff --git a/Completion/Linux/Command/_losetup b/Completion/Linux/Command/_losetup index d8e792aaf..affbc58f3 100644 --- a/Completion/Linux/Command/_losetup +++ b/Completion/Linux/Command/_losetup @@ -27,7 +27,7 @@ _arguments -s -S \ - '(resize)' \ {-c,--set-capacity}'[reread the size of the file associated with the loop device]' \ - 'detach' \ - '(-)'{--delete,--detach,-d}'[detach from specified loop device]' \ + '(-)'{--detach,-d}'[detach from specified loop device]' \ "$device" \ - '(detach-all)' \ {-D,--detach-all}'[detach all associated loop devices]' \ diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index 81d25a3f4..1657d411e 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -78,7 +78,7 @@ _rsync_info() { local opts opts=( ${${(M)${(f)"$(_call_program values $words[1] --info=help)"}:#*Mention*}/ ##Me/[me} ) (( $#opts )) && opts=( '(ALL NONE HELP)'${^opts}\] ) - _values -s , 'info option' $opts ALL NONE HELP + _values -s , 'info option' $opts ALL NONE HELP PROGRESS2 } _rsync_debug() { diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils index 4b98ec48e..356bda418 100644 --- a/Completion/X/Command/_x_utils +++ b/Completion/X/Command/_x_utils @@ -77,7 +77,7 @@ xev) '-s[use save-under]' \ '-name:window name' \ '-rv' \ - '*-event:event mask:(keyboard mouse expose visibility structure substructure focus property colormap owner_grab_button randr)' + '*-event:event mask:(keyboard mouse expose visibility structure substructure focus property colormap owner_grab_button randr button)' ;; xhost) local type tmp match