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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,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 04bb3682 for ; Tue, 30 Jul 2019 22:13:56 +0000 (UTC) Received: (qmail 2394 invoked by alias); 30 Jul 2019 22:13:46 -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: 44614 Received: (qmail 23985 invoked by uid 1010); 30 Jul 2019 22:13:46 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25524. spamassassin: 3.4.2. Clear:RC:0(205.235.26.22):SA:0(-1.6/5.0):. Processed in 2.06536 secs); 30 Jul 2019 22:13:46 -0000 X-Envelope-From: SRS0=V9kW=V3=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at bounces.park01.gkg.net designates 205.235.26.22 as permitted sender) X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1564524784; bh=K/mZTtpJrS56cA0sCjQQTJcS0DLG+Zbfpau4RXxevYA=; h=From:References:To:Subject:Date:From:Subject; b=VhPQWR30XsT//VAfqlTEVpfp6xl4vuUr+YXxqwIxch4vz91BeSPVgcgl8z64lsZHS8K2g62vDbP+619kHnlsBHLSyEGA91POjCmEVQbUgNXSYE/NkSgIGobL9PdXjEwZ3nwJ2FncZ3PCRrVW9x1jMvSl5vHdDhZCXpY+VxzAMhXNvW62BI5a3iQ5AdkBB8vT931Bnj36MIT/WQMXs799UAA3Sr7mALPD1Rkw3wLqnzlDpG9+mwoCHPvcfVmLiTHRXFZ/6IlLt4KOhVlyQdgwG/oh34hadU7CsFzs8Pq+jdrh+5HWypVZUnSea4m1j3zIYbgIS7WRJFP7Yn8WfcXy2A== X-YMail-OSG: 5bWiLnEVM1kf_oo7KKn77PSoUsRYBUQV2OtdJcSKUbXsVkYHomrYvipXaVgSktq uzRU3U0y3JVFqMoTgR0RbAquAmY59wAYrHWFnHXo7lUapxhzpj3FrTXokqbxg7taery_v_loEIn_ COMZxmzNI7KZA.uSfXEoVhdbhDFrjKtHiZK2CbIl_fk5KY71nPCABk94Qo3sF3DreEO_aH6PgBbx QLQSC80raZXnLyetKYO9CEprDqsY_B7R1Z0SgQeOkKnlBzAEhbF2Xnb1yoUQH_2Dncdtu45FcQzR 9YcdhtCPwoOCl6FYhtOGIoODfwcgu_ljnnPFYpI9OjInJGB1EuLqIr.twzMVmijKyQG7Dt6uJYly 57uRactIS_jGrh89tflRssLiMl4wPlqVVgeBYiucUztvKTDuRkF_fPELE5iOaeqgF3_d.jsgg4yb v6gTqIJ9iC_VUN9Qh8NDWzT0gjnHSOm0EEiL3CT77F.UB5Lkm1zXqNYL1O3hRGvsgPP3_RcpnwJU x70ox68639qYOUua8PmYK32z.R4Jj.H_FRqxB1UJ1ckeBGg4XE7qJj96o2qnaLP7q4w8noigYpwO uZoOLOb4eNi5dsXtx5YDFbz0XgQINa.XqOt_d3hTa.UbW09srr27J1Ad3x8cdgAm4rATonzQOtx0 Hu6h9QSeshRuBhECLJoyi7a09MKsWVJ5Q0tHlAm_eNbLmaTFQN3JsUWdesC.d4VUtT4pwPRkr7Ke swtay9kQgRWXJy9M19Z4LfNGyTmfKoqLlccy5.1GKSUMCUjq4HY9SX.nIjRb3j6NsTW2FUUevRE. CA1QVhLTTe3juFwWvA.FBGbpsxWSydz815vZpG30t834Lyjj4W4keqVU3GmTaaG2GejrcM5dCkrT teg4Q4nbVYm7NieYFeqTRBbr1g4JbK9DR4_vzrNTY0z5q1KyNFs8CMAkjleTBgYycSQIKgwCv0Sn MgeBJPKAGcJNj6.1FsEwGnVaQGnEWkuP6wce5X6tPdddSkFY.2iKyit8x3yHlB5pHcG6mNsed.x3 9I9awvFBap6s1mP3wsEMu9hcpB_Ftei25wTevruPuwuYRe6.OHWPgOWPSFdjsE0QOpZKB49nkF.F OGIF29OcVUG.f7MAEqJfhiR2XJQoiZu7P0CBtHgjpONYyUWXr1dTN0luYaS0ja0Ia2b_OJL5rgWl 9O0COVMP1znEqMytQ_qaS_8drXzP0t6oH In-reply-to: <20190730145353.k2eonyy6w2z7luau@sym.noone.org> From: Oliver Kiddle References: <20190730145353.k2eonyy6w2z7luau@sym.noone.org> To: zsh-workers@zsh.org, pkg-zsh-devel@alioth-lists.debian.net Subject: Re: apt autocompletion issue MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-ID: <95110.1564524783.1@hydra> Content-Transfer-Encoding: 8bit Date: Wed, 31 Jul 2019 00:13:03 +0200 Message-ID: <95111-1564524783.256179@YmUe.6pjL.n2dY> Axel Beckert wrote: > TL;DR: I recommend to just complete all packages upon > "apt list --upgradable ". Thanks, so this updated patch uses installed with --installed and avail otherwise. After checking the man page, I also added completion of reinstall and auto-removal for - and + suffixes. > > On 26 Jul, "Hauser, Felix (MRT)" wrote: > > > which is easily done in the normal bash file. Just for note Felix, while technically possible, I'd really recommend against trying to ever use bash completions with zsh. > Daniel Shahaf wrote: > > ??aptitude search -F %p '?upgradable'?? would print the right set of > > packages, I think, but aptitude isn't part of a minimal installation so > > can't be assumed available. A _deb_packages_update_upgradable function could check (( $+commands[aptitude] )) and offer all packages as a fallback. Or one of the options Axel mentions - if someone wants to do that. > > Cc += Debian zsh packagers. > > Thanks. I read Felix initial mail, but just adding three hard coded > long options seemed rather trivial... It's often not as trivial as it might first seem without a copy of the command to test combinations against. I probably need to install yet another VM to cover Debian given a large number of Debian specific completions. Out of interest, what is the recommended apt* tool these days? Is aptitude the best or most powerful with apt as the simplified interface and apt-get just a historic relic? Oliver diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt index 4486aa26d..4d60cd249 100644 --- a/Completion/Debian/Command/_apt +++ b/Completion/Debian/Command/_apt @@ -399,7 +399,13 @@ _apt-cmd () { -o,--option:arbitem \ -t,--target-release:release \ -- \ - /$'list\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ + /$'list\0'/ \( \ + \( \ + /$'--installed\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# /'[]'/ \| \ + // %-% /$'--[^\0]#\0'/ ':options:option:(--installed --upgradable --all-versions)' \ + \| \) \ + /$'[^-\0][^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \ + \) \| \ /$'search\0'/ /$'[^\0]#\0'/ ':strings:pattern:' \| \ /$'showsrc\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ /$'show\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ @@ -409,15 +415,14 @@ _apt-cmd () { /$'update\0'/ \| \ \( \ /$'(install|download|source|build-dep)\0'/ -'subcmd=${match%?}' \ - /$'[^\0]#\0'/ ':packages::_deb_packages -qr "\n\t\- /=" "$expl_packages[@]" avail' \# \ + /$'[^\0]#\0'/ ':packages::_deb_packages -qr "\n\t\- /=+-" "$expl_packages[@]" avail' \# \ \( \ // '%(.|)/%' -'[[ $subcmd = install ]]' /'[]'/ ':files: :_deb_files -c' \| \ /$'[^\0/=]#\/'/ /'[]'/ ':apt-releases:release name:_apt_releases' \| \ /$'[^\0/=]#='/ /'[]'/ ':apt-package-versions:package version:_apt_versions_of_binary_package' \| \ \) \ \) \| \ - /$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ - /$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ + /$'(remove|reinstall|purge)\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ /$'upgrade\0'/ \| \ /$'autoclean\0'/ \| \ /$'changelog\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ @@ -425,7 +430,7 @@ _apt-cmd () { /$'full-upgrade\0'/ \| \ /$'dist-upgrade\0'/ \| \ /$'edit-sources\0'/ \| \ - /"[]"/ ':argument-1::compadd "$expl_action[@]" list search showsrc show depends rdepends policy update install download source build-dep remove upgrade full-upgrade dist-upgrade edit-sources autoclean changelog autoremove purge' + /"[]"/ ':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 autoremove purge' _apt-cmd () { local expl_action expl_packages subcmd