From nobody Fri Nov 08 18:15:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XlRvc58Vdz5cbpt; Fri, 08 Nov 2024 18:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XlRvc4fQNz42vZ; Fri, 8 Nov 2024 18:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731089756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Y4YCb2PHeAeb32z/URzlu24OynwbRkNqfZQb+WUpXo=; b=xb1Y1rL/iyJV+zXSpitfaOtAFTJ2Rz87Uhmt543eCgvOWscoeoo51N+iRkckW32BKKXtSB E8YO4GYXU3hJP966SGmkRQM2ROVRca8xRDbjd8KzUtba96W8L6QadKZJvXtHmOazj3UIDm n6tE3J+IDFEZRf9EQSHeLEci/ZAMDkXo398q4fJtpDvoSa0SUrc5MNkyJJMUqm48fcsHTb Q+UQ5visX60t6kSoxoZM+4g2gFZBt+rNJxexFhaQSpglzrTaTptrM7bFl7S8gkEwlyiFg4 eKnbv7q4DY257mEsMRPNTnJKVDUaSHJoFb65xvYtFLMzt1oWVIoi/XQ/2QSVbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731089756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Y4YCb2PHeAeb32z/URzlu24OynwbRkNqfZQb+WUpXo=; b=uje1el5L6jIygO+H0icwbtMVBLb/fHZAj5YYfxf0ylK4ikG6jThUqDKiuOGPCGVptfKRP5 huTuiH1ouo0P1d0ouXPa5othMaRN/qDmKsFnYVdmYqg57BoDYZVqff+GChsiVVbbx/PXMu M3flPXaUWJ521Q9z1Vicv9V123egse+IivMl/7WjpkgAF3Ka7N3aWTroNH23OcuVCO5cey okjf0waV8cUOKA/C5l8jYmeB1+XRVjFYTVmadkU9zQSRkjNddgZg9Js5KOkCULDnz+ICzo RBu2D269OxQBSlmQgNwt5MStqyweBSkGa+TVxractR7e8yeYYnZacuoh+kCzGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731089756; a=rsa-sha256; cv=none; b=CCAZ76zWGHUBLaT7qPFkkXvdSnZc47tk2tFjTohMAQmGFopKOWEu4fKkXbWdhx4a4T0Dbi ult8e7SY79MD9DKJtgB3kaow8AG/0FiSJxMVIE6moRM7wk8HFaETApg+Zk+jCjsadHKKr/ 1jsGUyJnTpswCcN31v9PSVpHI+uX2toPSKbPSRK3dzrXy3eqSfHwQXAwzgSWbsTN1gQGRV lfVjTFrWjK+CuKd3NglgiNv3CRPgCoIzfYdklPZBsNNnAKYYjGHsLvX3VrnabWlEwJIR2u /dMTd4CMXbUCGBRLTFfN+FlAd7cLJPnMoj9gMAOZWT5hEWQoa/nyFMobb1EoSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XlRvc4BMHzgNR; Fri, 8 Nov 2024 18:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A8IFunG034593; Fri, 8 Nov 2024 18:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A8IFubf034590; Fri, 8 Nov 2024 18:15:56 GMT (envelope-from git) Date: Fri, 8 Nov 2024 18:15:56 GMT Message-Id: <202411081815.4A8IFubf034590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1eb3f15c149b - main - fwget: add -q for quiet output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1eb3f15c149b9a2e5b6f5e10aed454fc85945bbd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb3f15c149b9a2e5b6f5e10aed454fc85945bbd commit 1eb3f15c149b9a2e5b6f5e10aed454fc85945bbd Author: Bjoern A. Zeeb AuthorDate: 2024-11-04 23:59:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-08 18:13:54 +0000 fwget: add -q for quiet output Introduce -q to quieten other output (unless -v is also given). pkg-install(8) currently has no option to allow skipping unavail packages but it will just fail. We would realy want to try to install as much firmware found as possible from the installer. Work around this by doing one firmware package at a time. For that it is highly helpful to be able to query (or possibly re-query) all outstanding fimrware packages. -q together with -n only shows each package to be installed one by line. Once https://github.com/freebsd/pkg/issues/2195 will be implemented we could undo this part of the change and future changes to the installer and use the new option for pkg-install(8) there. While here switch to getopts so -qn works and not just -q -n. Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47445 --- usr.sbin/fwget/fwget.sh | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/usr.sbin/fwget/fwget.sh b/usr.sbin/fwget/fwget.sh old mode 100644 new mode 100755 index 154fb7dc92e1..3e2181e53b73 --- a/usr.sbin/fwget/fwget.sh +++ b/usr.sbin/fwget/fwget.sh @@ -38,7 +38,8 @@ Supported subsystems pci Options: - -n -- Do not install package, only print the results + -n -- Do not install packages, only print the results + -q -- Quiet mode. If used with -n only prints a package a line -v -- More verbose EOF exit 1 @@ -75,22 +76,27 @@ addpkg() } DRY_RUN=n +QUIET=n VERBOSE=n -while [ $# -gt 0 ]; do - case $1 in - -n) - DRY_RUN=y - ;; - -v) - VERBOSE=y - ;; - *) - subsystems="${subsystems} $1" - ;; +while getopts ":nqv" _arg; do + case ${_arg} in + n) + DRY_RUN=y + ;; + q) + QUIET=y + ;; + v) + VERBOSE=y + ;; + ?) + usage + ;; esac - shift done +shift $(($OPTIND - 1)) +subsystems="$@" # Default searching PCI subsystem if [ -z "${subsystems}" ]; then @@ -112,13 +118,25 @@ done case "${packages}" in ""|^[[:space:]]*$) - echo "No firmware packages to install." + if [ "${QUIET}" != "y" ]; then + echo "No firmware packages to install." + fi exit 0 ;; esac -echo "Needed firmware packages: '${packages}'" +if [ "${QUIET}" != "y" ]; then + echo "Needed firmware packages: '${packages}'" +fi if [ "${DRY_RUN}" = "y" ]; then + if [ "${QUIET}" = "y" ]; then + for pkg in ${packages}; do + case "${pkg}" in + ""|^[[:space:]]*$) continue ;; + esac + echo "${pkg}" + done + fi exit 0 fi