From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 44cfe9e2 for ; Thu, 21 Mar 2019 23:56:32 +0000 (UTC) Received: (qmail 23727 invoked by alias); 21 Mar 2019 23:56:19 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44159 Received: (qmail 17466 invoked by uid 1010); 21 Mar 2019 23:56:19 -0000 X-Qmail-Scanner-Diagnostics: from mail-it1-f193.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.1/25393. spamassassin: 3.4.2. Clear:RC:0(209.85.166.193):SA:0(-1.9/5.0):. Processed in 3.90812 secs); 21 Mar 2019 23:56:19 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.166.193 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=LyVvkKxwItfP1V0o9okhUo6qNHL+q9S14brkPl4z1YY=; b=GsYaVwuAwQXHBFVvjxcQOvQdME2fu996OtswmVIf8LJxyd5+9JdekoTvAUb8Oh+pOG YrpxwFR7ttpNb7rbhaHchzCvyjHZ+BftDbdrEmfl3zMljaTV59wAP/n4dXEy+V6BOhCj wbIAXgc6FXsfJaEP6KsTPJc0tZ8ZDXbWXYDPNV+AfwdWKlqrsztCotS1Wbu6Oa7JTm2P BSu5uXmgem1LwOCaPU/NgCB0G8dmSgncVu39cWp43HK3L28eqUhMC268cwSqtjh9AY/c dQC7xOF4oB7XvthIkc9HZa2VSXm/PXpBgCyIeM55hyDrE7kw73EGbNDhnFHwINcf+CZe +d9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=LyVvkKxwItfP1V0o9okhUo6qNHL+q9S14brkPl4z1YY=; b=Nn70+WocyModSNEPAooIkaOQ/bKvUIOI6XWHFjMmrfna/KtaBYT4Uw6JOMKCPynnr9 +5feSTeS+gEKOpz/vvVND3Svtm6qHK7x0YuaRUyrt1kJdOQUVKUjgdXzWRdvflFWjPUP LBITrEvbe/byAgcUzw+d/mnwxn+u5WU+/3py+TChHfLXzrSZk+pxdjutoK2dDgxUs22m 2slbt9T1dihAZ8H+SIrFqH9eq6+PScUhlAf/Q2WJi7t5urXzZaBJ0Xub6BGoiEuFBs4/ 6zIGEAA1RL1gVPawc+1OSj9QqR2WSOg7QUkezBr8fKX12mzmO+N5+DgzXQSZETrtX4aG OdDA== X-Gm-Message-State: APjAAAUXvGd8t3ufc6V/VE+DAwGFAM+xJHPHYyzdOXR67y/7Q7a0Xjzs f7fDSDz+Mdw8bcsWcqQiztrCANR+eIUEIw== X-Google-Smtp-Source: APXvYqy2MYpNBorp2pWgH0jI0PCwthjhg86EJPMGM9ovGyyV+ST6ewX/kNZow/xuCIZnzl42O5/WIQ== X-Received: by 2002:a24:9a83:: with SMTP id l125mr1142937ite.59.1553212541872; Thu, 21 Mar 2019 16:55:41 -0700 (PDT) From: dana Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: [PATCH] Completion: Support .ddeb/.udeb for Debian packages Message-Id: <0EDB69C7-C277-49DC-B3ED-59264D421F4B@dana.is> Date: Thu, 21 Mar 2019 18:55:40 -0500 To: Zsh hackers list X-Mailer: Apple Mail (2.3445.9.1) This just updates every function that completes *.deb files to also = offer *.ddeb and *.udeb. (Several already included the latter, but none the = former) There are also some functions like the ones for dak and madison where a 'binary type' is completed =E2=80=94 most of those handle udeb, but i'm = unsure if ddeb is a separate type for their purposes, so i've left them alone dana diff --git a/Completion/Debian/Command/_apt = b/Completion/Debian/Command/_apt index dd837379c..fc2c0916f 100644 --- a/Completion/Debian/Command/_apt +++ b/Completion/Debian/Command/_apt @@ -411,7 +411,7 @@ _apt-cmd () { /$'(install|download|source|build-dep)\0'/ -'subcmd=3D${match%?}' = \ /$'[^\0]#\0'/ ':packages::_deb_packages -qr "\n\t\- /=3D" = "$expl_packages[@]" avail' \# \ \( \ - // '%(.|)/%' -'[[ $subcmd =3D install ]]' /'[]'/ ':files:package = file:_files -g "*.(changes|deb|dsc)(-.)"' \| \ + // '%(.|)/%' -'[[ $subcmd =3D install ]]' /'[]'/ ':files:package = file:_files -g "*.(changes|[du]#deb|dsc)(-.)"' \| \ /$'[^\0/=3D]#\/'/ /'[]'/ ':apt-releases:release name:_apt_releases' \| = \ /$'[^\0/=3D]#=3D'/ /'[]'/ ':apt-package-versions:package = version:_apt_versions_of_binary_package' \| \ \) \ diff --git a/Completion/Debian/Command/_apt-file = b/Completion/Debian/Command/_apt-file index 98a93fdd3..89943c160 100644 --- a/Completion/Debian/Command/_apt-file +++ b/Completion/Debian/Command/_apt-file @@ -36,7 +36,7 @@ case $state in case $line[1] in search|find) if (( $#opt_args[(I)(-D|--from-deb)] )); then - _wanted files expl 'debian package' _files -g '*.deb(-.)' + _wanted files expl 'debian package' _files -g '*.[du]#deb(-.)' elif (( $#opt_args[(I)(-f|--from-file)] )); then _files else diff --git a/Completion/Debian/Command/_debdiff = b/Completion/Debian/Command/_debdiff index 6f8519a4a..59b2a109a 100644 --- a/Completion/Debian/Command/_debdiff +++ b/Completion/Debian/Command/_debdiff @@ -19,4 +19,4 @@ _arguments \ '(-q --quiet)'{-q,--quiet}'[be quiet if no differences]' \ '--from:debs:_files -g "*.deb(-.)"' \ '--to:debs:_files -g "*.deb(-.)"' \ - '*:file to compare:_files -g "*.(deb|changes|dsc)(-.)"' + '*:file to compare:_files -g "*.([du]#deb|changes|dsc)(-.)"' diff --git a/Completion/Debian/Command/_dpkg = b/Completion/Debian/Command/_dpkg index 5c8f17f03..5458344db 100644 --- a/Completion/Debian/Command/_dpkg +++ b/Completion/Debian/Command/_dpkg @@ -18,13 +18,13 @@ _dpkg_deb_only_actions=3D( =20 _dpkg_deb_actions=3D( '(--build -b)'{--build,-b}'[build archive]:directory:_files -/' - '(--contents -c)'{--contents,-c}'[list contents]:Debian = package:_files -g "*.u#deb(-.)"' - '(--info -I)'{--info,-I}'[show info]:Debian package:_files -g = "*.u#deb(-.)"' - '(--field -f)'{--field,-f}'[show fields]:Debian package:_files -g = "*.u#deb(-.)"' - '(--control -e)'{--control,-e}'[extract control]:Debian = package:_files -g "*.u#deb(-.)"' - '(--extract -x)'{--extract,-x}'[extract files]:Debian package:_files = -g "*.u#deb(-.)"' - '(--vextract -X)'{--vextract,-X}'[extract and list files]:Debian = package:_files -g "*.u#deb(-.)"' - '--fsys-tarfile[output fs tarfile]:Debian package:_files -g = "*.u#deb(-.)"' + '(--contents -c)'{--contents,-c}'[list contents]:Debian = package:_files -g "*.[du]#deb(-.)"' + '(--info -I)'{--info,-I}'[show info]:Debian package:_files -g = "*.[du]#deb(-.)"' + '(--field -f)'{--field,-f}'[show fields]:Debian package:_files -g = "*.[du]#deb(-.)"' + '(--control -e)'{--control,-e}'[extract control]:Debian = package:_files -g "*.[du]#deb(-.)"' + '(--extract -x)'{--extract,-x}'[extract files]:Debian package:_files = -g "*.[du]#deb(-.)"' + '(--vextract -X)'{--vextract,-X}'[extract and list files]:Debian = package:_files -g "*.[du]#deb(-.)"' + '--fsys-tarfile[output fs tarfile]:Debian package:_files -g = "*.[du]#deb(-.)"' ) =20 _dpkg_common_actions=3D( @@ -35,7 +35,7 @@ _dpkg_common_actions=3D( =20 _dpkg_actions=3D( '(--install -i)'{--install,-i}'[install packages]:*:Debian = packages:->install' - '--unpack[unpack package]:Debian package:_files -g "*.deb(-.)"' + '--unpack[unpack package]:Debian package:_files -g "*.[du]#deb(-.)"' '--configure[reconfigure specified packages]:*:package:->configure' '(--remove -r)'{--remove,-r}'[remove package]:*:package:->remove' '(--purge -P)'{--purge,-P}'[purge package]:*:package:->purge' @@ -76,7 +76,7 @@ _dpkg_options=3D( _dpkg_options_recursive=3D( '(--recursive = -R)'{--recursive,-R}'[recursive]' ) =20 _dpkg_deb_and_query_only_actions=3D( - '(--show -W)'{--show,-W}'[show package info]:Debian package:_files = -g \*.u\#deb\(-.\)' + '(--show -W)'{--show,-W}'[show package info]:Debian package:_files = -g "*.[du]#deb(-.)"' ) =20 _dpkg_deb_and_query_only_options=3D( @@ -147,7 +147,7 @@ case "$state" in "$_dpkg_options_recursive[@]" \ '*:directory:_path_files -/' \ - nonrecur \ - '*:Debian package:_path_files -g "*.deb(-.)"' + '*:Debian package:_path_files -g "*.[du]#deb(-.)"' ;; remove|status|listfiles) _call_function ret _dpkg_$state && return ret diff --git a/Completion/Debian/Command/_lintian = b/Completion/Debian/Command/_lintian index d60acc9ed..2b0f7cf36 100644 --- a/Completion/Debian/Command/_lintian +++ b/Completion/Debian/Command/_lintian @@ -38,7 +38,7 @@ case "$service" in '(-s --source)'{-s,--source}'[the following packages are source]' = \ '--udeb[the following packages are udebs]' \ '(-p --packages-file)'{-p,--packages-file}'[process packages = listed in file]:list:_files' \ - '*:package:_files -g "*.(changes|deb|dsc)(-.)"' && return 0 + '*:package:_files -g "*.(changes|[du]#deb|dsc)(-.)"' && return 0 ;; =20 (lintian-info) diff --git a/Completion/Debian/Command/_piuparts = b/Completion/Debian/Command/_piuparts index a1b6666a3..3b612a3ad 100644 --- a/Completion/Debian/Command/_piuparts +++ b/Completion/Debian/Command/_piuparts @@ -24,7 +24,7 @@ case "$state" in if (( $+opt_args[-a] )); then _deb_packages avail else - _files -g '*.deb(-.)' + _files -g '*.[du]#deb(-.)' fi ;; esac