From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3826 invoked from network); 31 Mar 2022 03:48:32 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 31 Mar 2022 03:48:32 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1648698513; b=iooZJC82W9l+VrOyPrp7bgvQAvGyWXBM6Sq+UfWi3RN6q3ndPRqXKdt/4MkbFB6frDe1PIwkYZ DKkR3xVFb20NQUm1FCuN2YTz9dv4GpQwn//ckhIGS9baBQs+87wrbg4zxgOWBWo99O2my7k8W2 vCVXEtlVUEvYGvp2fDIq6P5lEuBpsZ5QAVK07F0+ZTCmP8ghvAHTiBTi2Q/M939EhTly1hS/GU tDSijOddIbCS8YJdNBU3JOgjoN6Q3Agz7UdoT5Lcih9o9CpKbRaL1Z8sM9SFpta+2yZFlIMHn4 zAkh3om+2UipJD8WmbwtMFmPtaq4iSRyqy6inKoGg3R7Qg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-oa1-f46.google.com) smtp.remote-ip=209.85.160.46; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1648698513; bh=KDw2Adbz1rHHI7Cu7AgEN6CxI47bvmWhuHxgHH+Hbe4=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:MIME-Version:Message-ID:Subject:To:From:Date: DKIM-Signature:DKIM-Signature; b=FfawPqV+0Y0VOnoogXIaaluMQilwUVa6tw/swA05lJwRxctYwWcdHClfV07erwWvN+KmR3uuAT C+4XbLdZCqrigv4AQ4+vbJULbEupkBXssSkKZY+QHO1taQp/eNtsGWBS8U8NyQgvsCUBvxxmxy KPULrj6p8skfeUDLMv3DX4ZrRQY9S3V7Ky8OyCPQL4jpv8WQ32fHF1O971jjplVvxC59X5gyiC vnfFTwzb/uK5XnMizH42rBxje7NwtvfQLFVyM32cAOX4KAxKFoNlMxRB9IilUekGoWbjsdvwIU bJ+DBT2ONUI/A1YOGNPBLrfYapGEy0mdjqypwGdx3yCNEA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:MIME-Version:Message-ID: Subject:To:From:Date:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=+fDABQtltWtzEY006aS8m3DZ2yInj1BeQ9Co7fftW+g=; b=QAdVqMsn7GEYLtgK4PsbGGQGw8 fsvqCZAF9mJKuBbk2LptbFijeNe18kDuRBMwf4LDQWueMmVicUGD+50Vu5NGLzkvXvcTmDKvvLVzi HCymDpJmf5yrleHChW6jlbnqg6aDlEFxA+OM6icE3ZS8QR7HEZgYWkbHAEZY/Jc4+TjdZfqx6245E 7+8xQnJUuJ2g+398vFSGmtnSbW2mvzAXGAYWhJiWY8Q9hq41IriaITe+ralIVhVd7MDZajiWy09WJ lwYzPSu9TL3IRahO6dLqsZFMeollIGikQLjkOiLVJMsLCil936RGsWSPGUgAIV0wWaRjOJkFuYLzk ozNgOyCA==; Received: from authenticated user by zero.zsh.org with local id 1nZlnT-000Mas-Ex; Thu, 31 Mar 2022 03:48:31 +0000 Authentication-Results: zsh.org; iprev=pass (mail-oa1-f46.google.com) smtp.remote-ip=209.85.160.46; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-oa1-f46.google.com ([209.85.160.46]:45119) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nZlnD-000MGK-4f; Thu, 31 Mar 2022 03:48:15 +0000 Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-d6ca46da48so24071147fac.12 for ; Wed, 30 Mar 2022 20:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:mime-version :content-disposition; bh=+fDABQtltWtzEY006aS8m3DZ2yInj1BeQ9Co7fftW+g=; b=mIzrHHwxhnvKDVzOpXi9T3cCYh21F9s41ZxWUIG0Gm9KVMD7Q9bKalxBxkNOzlYdVY BWtMi4fmuJdx89JPkcUZU3rD7xqP+fS5VmpgShZpsklpdnmTuMcTLNm0v3C4t2CUvinx AX1V1bl2Mlx855IrH099ZGAi8Vm3BwQOexqDrZ2ES9DDnbqXxDZ5FhhBjtekqtZwvb7i 3ZIoVuKlg2f4yTZLz1R22gLHOXOtzy+aik1MEgcDHH9EuClpSoLU5ho8zS/e+L6/TiK3 v5Xk8u1mQ7c1wh3O2d8anexmTDon/ByDsqVKer1YWfpFk8K+zXlQqGRVZ534lvhTvJXZ DGcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :mime-version:content-disposition; bh=+fDABQtltWtzEY006aS8m3DZ2yInj1BeQ9Co7fftW+g=; b=TVNpTA4PuUpKyqB9DN9yKddCwXnwDJlKcNQsUfR/MbRpYnN+otIYpYpJZnSiAoNyv/ 5aSCMCgW0aOxTG/Gns6z5r0+H6rFMsrO6m8v2r5a5QhSor0mmP0lUgNCKFTC7tw4wTG3 C1a5Phk3OvoPIRWyTWvfUrhbtsSn8sgse8mzthO+KFfj8VQo3NpxpEX/hxey1ALM2Hu6 HSFPxKCmK5Q9CGDNLXPhoMBhNIzbVFbyv+KL091EKOESkX8tvpBY2o1uBob/cosuo6Cb Mg9o36gvV5u2ul5EcHCMzHPdaLPmg+wT4o6wJGd5QjiQs/JqlV6iUP/FsI5OYg9qI1n/ Ucgg== X-Gm-Message-State: AOAM5324A2qrz5QfwewIxnHSISg29B02MKkX/43scwngnehmMlGUsnnN WtAMj7TcnRWUY4AyFjaHS+bjqWrGVQA= X-Google-Smtp-Source: ABdhPJwIfThJZfQQWzHee83X0SrRqXCpJ15dAdLoRTpDq17MFCkfTxrlAqSPCfuB7ET6iMMvm7ViYQ== X-Received: by 2002:a05:6870:b4a7:b0:dc:ff8b:9d46 with SMTP id y39-20020a056870b4a700b000dcff8b9d46mr1676952oap.293.1648698493513; Wed, 30 Mar 2022 20:48:13 -0700 (PDT) Received: from CptOrmolo.darkstar (cpe-76-184-110-212.tx.res.rr.com. [76.184.110.212]) by smtp.gmail.com with ESMTPSA id r29-20020a056808211d00b002f76ea70064sm2678498oiw.35.2022.03.30.20.48.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 20:48:13 -0700 (PDT) Date: Wed, 30 Mar 2022 22:48:10 -0500 From: Matthew Martin To: zsh-workers@zsh.org Subject: PATCH: Update _bsd_pkg Message-ID: Mail-Followup-To: zsh-workers@zsh.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Seq: 49931 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Mostly adding + to flags which take arguments. NetBSD's pkg_delete has a few new flags and removed -a. OpenBSD's -D can be repeated and no longer has cdrom permissions. diff --git a/Completion/BSD/Command/_bsd_pkg b/Completion/BSD/Command/_bsd_pkg index 6bdce58e0..82cf6226c 100644 --- a/Completion/BSD/Command/_bsd_pkg +++ b/Completion/BSD/Command/_bsd_pkg @@ -78,12 +78,12 @@ _bsd_pkg() { ;; openbsd*) flags+=( - '-A[arch to assume for any package tests]:architecture:_obsd_architectures' + '-A+[arch to assume for any package tests]:architecture:_obsd_architectures' '-a[do not record packages as installed manually]' '-aa[force already installed packages to be tagged as installed automatically]' - '-B[specify destdir prefix]:destdir directory:_files -/' + '-B+[specify destdir prefix]:destdir directory:_files -/' '-c[while replacing packages, delete extra configuration file in the old package]' - '-D[specify failsafe to waive]:failsafe:(( + '*-D+[specify failsafe to waive]:failsafe:(( allversions\:"do not trim older p* variants of packages for updates" arch\:"architecture recorded in package may not match" checksum\:"verify checksums before deleting or tying old files" @@ -91,9 +91,7 @@ _bsd_pkg() { donttie\:"do not try to find new files in old packages by comparing the stored sha256" downgrade\:"do not filter out package versions older than what is currently installed" installed\:"in update mode, reinstall an existing package with the same update signature" - libdepends\:"library specifications may not be fulfilled" nonroot\:"install even if not running as root" - paranoid\:"do not run any @exec/@unexec" repair\:"attempt to repair installed packages with missing registration data" scripts\:"external scripts may fail" SIGNER\:"list of trusted signers, separated by commas" @@ -103,10 +101,10 @@ _bsd_pkg() { ))' '-I[force non-interactive mode]' '-i[force interactive mode]' - '-L[specify a localbase]:localbase:_files -/' - '-l[specify pkg_info output file to install]:pkg_info file:_files' + '-L+[specify a localbase]:localbase:_files -/' + '-l+[specify pkg_info output file to install]:pkg_info file:_files' '-m[always display progress meter]' - '-P[check distribution permissions]:permission type:(cdrom ftp)' + '-P+[check distribution permissions]:permission type:(ftp)' "-qq[don't check checksums]" '-r[replace existing packages]' "-s[don't install; just report disk size changes]" @@ -143,26 +141,28 @@ _bsd_pkg() { case "$OSTYPE" in netbsd*) flags+=( - '(:)-a[delete all installed packages]' '(:)-A[remove automatically installed packages that are no longer required]' "-D[don't execute deinstallation scripts]" '-F[specify each package by an installed file]' '-f[force deinstallation]' - '-K[override PKG_DBDIR]:pkg_dbdir:_files -/' + '-ff[force deinstallation even if preserved]' + '-K+[override PKG_DBDIR]:pkg_dbdir:_files -/' + '-k[silently skip preserved packages]' + '-N[leave the files installed]' "-O[only delete the package's entries]" - '-P[specify destdir prefix]:destdir directory:_files -/' - '-p[specify prefix]:prefix directory:_files -/' + '-P+[specify destdir prefix]:destdir directory:_files -/' + '-p+[specify prefix]:prefix directory:_files -/' '-R[delete upward recursively]' '-r[delete recursively]' '-V[show version and exit]' - '(-a)*:package name:_bsd_pkg_pkgs_and_files' + '*:package name:_bsd_pkg_pkgs_and_files' ) ;; openbsd*) flags+=( '-a[delete unused dependencies]' - '-B[specify destdir prefix]:destdir directory:_files -/' - '-D[specify failsafe to waive]:failsafe:(( + '-B+[specify destdir prefix]:destdir directory:_files -/' + '*-D+[specify failsafe to waive]:failsafe:(( baddepend\:"force deletion of packages even if they reference nonexistent dependencies" checksum\:"verify checksums before deleting or tying old files" dependencies\:"delete the set of packages that depend upon the requested packages" @@ -190,11 +190,11 @@ _bsd_pkg() { '(:)-a[show all installed packages]' '-c[show comment fields]' '-d[show long descriptions]' - '-e[test if package is installed]:package name:_bsd_pkg_pkgs' + '-e+[test if package is installed]:package name:_bsd_pkg_pkgs' '-f[show packing list instructions]' '-I[show index lines]' '-L[show full pathnames of files]' - '-l[specify prefix string]:prefix string:' + '-l+[specify prefix string]:prefix string:' '-q[be quiet]' '-R[show list of installed requiring packages]' '-s[show total size occupied by each package]' @@ -210,13 +210,13 @@ _bsd_pkg() { '-D[show install-message files]' '-F[specify each package by an installed file]' '-i[show install scripts]' - '-K[override PKG_DBDIR]:pkg_dbdir:_files -/' + '-K+[override PKG_DBDIR]:pkg_dbdir:_files -/' '-k[show deinstall scripts]' '-m[show mtree files]' '-N[show which packages each package was built with]' '-n[show which packages each package needs]' '-p[show installation prefixes]' - '-Q[show the definition of the specified variable from the build information]:variable:' + '-Q+[show the definition of the specified variable from the build information]:variable:' '-r[show list of installed requiring packages recursively]' '-S[show total size occupied by each package and its dependents]' '-u[show information for all user-installed packages]' @@ -228,14 +228,19 @@ _bsd_pkg() { flags+=( '(:)-A[show all installed packages, including internal packages]' '-C[show certificate information]' + '*-D+[specify failsafe to waive]:failsafe:(( + SIGNER\:"list of trusted signers, separated by commas" + snap\:"force %c and %m to expand to snapshots" + unsigned\:"allow the installation of unsigned packages without warnings/errors" + ))' '-E[show the package that contains the specified file]:file:_files' # XXX only with -L '-K[prefix filenames with category keywords]' '-M[show the install-message file]' '-m[only show manual installations]' '-P[show the pkgpath]' - '-Q[show packages matching the specified query]:query:' - '-r[check the list of packages for a specified pkgspec]:pkgspec:' + '-Q+[show packages matching the specified query]:query:' + '-r+[check the list of packages for a specified pkgspec]:pkgspec:' '-S[show the update signature]' '-t[show packages not required by any other]' '-U[show the deinstall-message file]'