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=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3189 invoked from network); 28 Jun 2023 09:49:42 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 28 Jun 2023 09:49:42 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1687945782; b=rZs9qM+ManlILqgP3XkC41sJQJp7wdPH0HliLzGpVorskB7Z+xLypi2SH+QxPnomf6d7rzQJby mntArSjvUGkNEf1AT1OB0c2wjohg36wSZTi8zLPf8WWCVnqTWzadTD9kRRSkWlP2gaMuErTbAA NzT1ZKqLb1XEoG7O+0zKQUO+C7s6G70I1cg8SgeSGmk784f553VDqrI0oKfYg0i9lcPXacLhR7 FrVX8BiqezoFepMnclzjlSWYI3So9H/83I4/+zw3vTsJBoKXdnV8TT2nZD4hVrbc1LaT+rbwAG wB01M5s8N9kf3rTTtRiV5SXQBIpFb5fQ1IvqmqN/WCnW7w==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-pf1-f176.google.com) smtp.remote-ip=209.85.210.176; dkim=pass header.d=gmail.com header.s=20221208 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=1687945782; bh=yYuG45P2vMNazNV59Ab1zECEbLLgybeZFFLLMNHJ49k=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:DKIM-Signature: DKIM-Signature; b=Cq+wPDgwhClSMFsUn/7VdhD3Ver2uoj7TrRNKdgKcSI3S7t/Y3JDVLayeoUsbSS660lkvpBbLY Q4l7kpclIZBPRYyMq0FjR8ERPOCjc58NG9yDhsa79uiEZYY6pM6A38mGGx30bF6FBchHGQQ38R ldQhwtHNCdEaRZQaDL2uOu1NZnWJ49KBv7eLuAA72uCnTqBBLO77+XWCGDtLjFC/uDM3czrupa W4drRPPJkiZMWkQt38RvTCHKNds1PjRC4MvmHTs9t8yNWZHCvjIYjL+9HkVQYEu1cn4FIZe1d7 QTC3tIZg5K6HK9n8GBlfJBSrwtfXyGWXtppmMrL2AiIMeA==; 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-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=Dmiu+1Adw2IbKupHipNlioI6SXD06xy+Z3c86CzyFow=; b=X2iHMHTYYEy7H1ZdpCE7jJZ7Rb gHkIWtgyEuyZ8tVqVvg1i3tnGR4/tvJbgkeqXaHnSdNdjx2m/HCp/RWiHW3a6sXKYs/6eYAPv9OuK 9heyDx0EoJVFsMe/fezBaarUqen9pOvI27jJPTkhNVvB8qKt9oUhjC1oshuALY7w5ko4Iza9XgiEv dOqbQqywkywaIeGo+WRcvOCdnM1bJiwOFDni+x0LxcQCzkaNqYi0uFGlWYbSmJmj6fUjiX9gHdKCm ZeevQ+KzK/BUeE4PuvKjgg84d9iJRLDNywxa8QXRMaje1CK1+XycDL5U0UMfsUjZvImTnWdBZmZFS nSSEGmGw==; Received: by zero.zsh.org with local id 1qERny-0002FK-7F; Wed, 28 Jun 2023 09:49:42 +0000 Authentication-Results: zsh.org; iprev=pass (mail-pf1-f176.google.com) smtp.remote-ip=209.85.210.176; dkim=pass header.d=gmail.com header.s=20221208 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-pf1-f176.google.com ([209.85.210.176]:48436) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qERmE-0001K0-P6; Wed, 28 Jun 2023 09:47:55 +0000 Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-66c729f5618so4009229b3a.1 for ; Wed, 28 Jun 2023 02:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687945673; x=1690537673; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dmiu+1Adw2IbKupHipNlioI6SXD06xy+Z3c86CzyFow=; b=a+Jig7hOWukkCLfqedCBu0w6ZVVRE6HUa2MJ/kMS/ngppa5hoWhgEhGJj58YjsaczS 3zfXI6K8uixHDxdus3FPnMJD+CppcKXYdSmNsTziZthUNUrf6kXF6LhqagEOCgTdeP6b xyVGym7TsRzLvell0U08sKBjxm5nYoqTa8d3iRaR81GgMT0tF3ABcXDi9oqHNiHvodbT HcEmZpZF8NOSFyOn3rCZoOEaJNZEjissQ9Rq/CAQm9Q2upiiFvxkv/Yb04asWhPGTJ2j 2Bi0KY8+l/YFZe9/YtxRa8LX10QWjnBnBWrwe6EwRS/AQ6lz86duPS9KFsl44SLbYy2E RIrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687945673; x=1690537673; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dmiu+1Adw2IbKupHipNlioI6SXD06xy+Z3c86CzyFow=; b=NxfLhcW0vrQmQD78ruCpEyC9VyqX7kD1GT2V3RsbhoRGSnlvL4Wm/HFhRnwbwiXU7W 8ExAwYagBYsB7SGJi4vIGJ94iWijwK0u69v/cNQ0IZVEEIu9FnmVEyJgdyLT5rdUsSZe g3FHdU8NSJTGsvGxWINCRQEKrg5phxKMnVf8wTHLDoetEp7Z4jTlERPRem4kHVF6qDKZ azBfIGgos+fTC7Rk4UV1OBYvOr4GHNlvKj9adNPd1i5AMVNC7wqjmhDxYYlr2hu5QNI2 6Tf2D9+iwapgFloI8ICzoBnAFe0N4aG1AX/55oun3j11yv3soSq2rF5j61yhS7WNoJ5J Wj2Q== X-Gm-Message-State: AC+VfDyouYZkTK68afY11+pXRw2VrUysijQJmY6lLXUfc0RNdfwgjdbB 3cPV93LhJ8PIuddAEt17grdGz0RESqQ= X-Google-Smtp-Source: ACHHUZ7sCd/mIbJSJUTYkzl2mpZtZ2nLUVE+1tNNTl/eyWn9ScOL/K+XEhCsYGSqpN8kAi6NEYKl3g== X-Received: by 2002:a05:6a20:a10d:b0:121:c2f7:df3e with SMTP id q13-20020a056a20a10d00b00121c2f7df3emr32421798pzk.12.1687945673137; Wed, 28 Jun 2023 02:47:53 -0700 (PDT) Received: from localhost.localdomain (49.212.151.152.v6.sakura.ne.jp. [2403:3a00:202:1112:49:212:151:152]) by smtp.gmail.com with ESMTPSA id e18-20020a62aa12000000b00666d7ef2310sm2882269pff.94.2023.06.28.02.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 02:47:52 -0700 (PDT) From: Shohei YOSHIDA To: zsh-workers@zsh.org Cc: Shohei YOSHIDA Subject: [PATCH 1/1] Update softwareupdate completion for macOS 13 Date: Wed, 28 Jun 2023 18:47:34 +0900 Message-Id: <20230628094734.130645-2-syohex@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628094734.130645-1-syohex@gmail.com> References: <20230628094734.130645-1-syohex@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 51895 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: --- Completion/Darwin/Command/_softwareupdate | 58 ++++++++++------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/Completion/Darwin/Command/_softwareupdate b/Completion/Darwin/Command/_softwareupdate index 6054fd768..9cad43dc1 100644 --- a/Completion/Darwin/Command/_softwareupdate +++ b/Completion/Darwin/Command/_softwareupdate @@ -1,19 +1,8 @@ #compdef softwareupdate -_softwareupdate_ignored_update_name() { - if [[ -z "$_softwareupdate_ignored_updates" ]]; then - local res="$(_call_program pkgs softwareupdate --ignored)" - _softwareupdate_ignored_updates=("${(Qs/, /)${${res#Current ignored updates: \(}%\)}}") - fi - if (( ${#_softwareupdate_ignored_updates} > 0 )); then - _wanted pkgs expl "ignored package" compadd -a _softwareupdate_ignored_updates && return 0 - fi - return 1 -} - _softwareupdate_update_name() { local name line - if [[ -z "$_softwareupdate_updates" ]]; then + if [[ ! -v _softwareupdate_updates ]]; then _softwareupdate_updates=() for line in ${(f)"$(_call_program pkgs softwareupdate --list)"}; do if [[ $line == ' '* ]]; then @@ -37,36 +26,39 @@ _softwareupdate() { _arguments -R \ '(-h --help -l --list)-q[quiet mode]' \ {-l,--list}'[list all available updates]:*:' \ - {-d,--download}'[download to directory set in InternetConfig]:*:' \ + {-d,--download}'[download only]:*:' \ {-i,--install}'[install (requires root)]:*: :->install' \ - '--ignored[show or manage ignored updates list (per-user)]:*:: :->ignored' \ + '--list-full-installers[list the available macOS installers]' \ + '--fetch-full-installer[install the latest recommended macOS installer]:*: :->fetch-installer' \ + '--install-rosetta[install rosetta]' \ + '--background[trigger a background scan and update operation]' \ '--schedule[scheduler preferences (per-user)]:automatic checking:(on off)' \ + '--dump-state[log the internal state of the SU daemon to /var/log/install.log]' \ + '--evaluate-products[evaluate a list of product keys specified by the --products option]' \ + '--history[show the install history]' \ + '--no-scan[do not scan when listing or installing updates]' \ + '--product-types[limit a scan to a particular product type only]:product_type' \ + '--products[a comma separated list of product keys to operate on]:product_keys' \ + '--force[force an operation to complete]' \ + '--agree-to-license[agree to the software license agreement without user interaction]' \ + '--verbose[enable verbose output]' \ {-h,--help}'[print command usage]:*:' && return 0 case "$state" in install) _arguments \ - '(* -a --all)'{-a,--all}'[all available active updates]' \ - '(* -r --req)'{-r,--req}'[all required active updates]' \ + '(-a --all)'{-a,--all}'[all available active updates]' \ + '(-r --recommended)'{-r,--recommended}'[all updates that are recommended for your system]' \ + '--os-only[only macOS updates]' \ + '--safari-only[only safari updates]' \ + '(-R --restart)'{-R,--restart}'[automatically restart if required to complete installation]' \ + '--stdinpass[password to authenticate as an owner]' \ + '--user[local username to authenticate as an owner]' \ '*:update name:_softwareupdate_update_name' && return 0 ;; - ignored) - local -a ignored_subcmd - ignored_subcmd=(add remove) - - if (( CURRENT == 1 )); then - _describe -t commands "subcommand" ignored_subcmd && return 0 - fi - case $words[1] in - add) - _softwareupdate_update_name && return 0 - ;; - remove) - _arguments \ - '(* -a --all)'{-a,--all}'[all available active updates]' \ - '*:update name:_softwareupdate_ignored_update_name' && return 0 - ;; - esac + fetch-installer) + _arguments \ + '--full-installer-version[specify the version macOS to install]:version' \ ;; esac return 1 -- 2.39.2