From nobody Mon Sep 09 20:21:00 2024 X-Original-To: dev-commits-doc-all@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 4X2dWc6hFPz5TwjF for ; Mon, 09 Sep 2024 20:21:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X2dWc66PKz4h9F; Mon, 9 Sep 2024 20:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725913260; 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=q+jTTxLp54evcKxLSLaCbOQlVa23z08cUsmdh5DB9vA=; b=odflF1DDb4hJiDEarSnHfUz4NfSJFA782lh8xZv5xqu5BvUlpx1DgfHAh3JEBGsvigd6Dx fUjDSU8jtUhWEiSaeuOl4m9qDUx7oHESmzYGO6oDZcEIh8jYRx0CbgHUJtXj5QgDNR76Po VFcxdyESWFL0KWLrVeJ/fz+eSnauYkbZq4DnuBJA6S3JPrFafN12Rea+1tYt27pR1eSkfq kfNiuUf//eBMaIOo8BeNXRdJ4gOqVL6ZkIRcFhvA4ogVG0i5Fb7990yKeILRq8dH/tw2Fi DpjuSCkgtJ7Ju6q1r/DYt1jg8b1ldT0UWU9nhcDnsQsHGoCmYYpSZ34bDS8lOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725913260; a=rsa-sha256; cv=none; b=GWMe0x6c0hSWbv7s1S09+9syNl9OcFQxvFfel6sP1tQjWzxQIc/E1WagGhPf5BLBQMY6HL hJGOXkzzFHCnT7fchYfbdrI9gb/CArxQPkqscAU28Ln4J3W9uabzizz0wyRAcWErdCRyl5 JmdqPx+3OZP3C5EGrYyGT/0uxCcecLLjKXGqCpyRNgEq79BGrwXm22b3IXJWRW3WaO3a2q fq0BeZEUPL/YS9RKYNI+FWtsei2tFTf6d743qzyV3Gg6vDCNnbp6Eq+Lr9qj8AN9M7hoFr LTeo8gsgmxLHxONa/uZvZOLRndUYjao8NlM6aXlvI2IzNesvNpBo04hA7IKf3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725913260; 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=q+jTTxLp54evcKxLSLaCbOQlVa23z08cUsmdh5DB9vA=; b=rbLpV5DEBscnJQAVDP8kqcarocch+uXCz224IGL2ceAYycHghq/btyoVVIPP1XtrA91/nm C+wbUHC5Fykro3TcEmqr2AUbbzczYJszUB1E+g0nzZzWBRFR0V8FOO1fxWrKNQpvsU0+3m H3Ow9SNHDLezfLoMUjzzDF9QHfrC6U+hXsxH2r/DF/0FT/mxXNlYZYZMPkzKwwgM7nfX6O WmXDW9Z+Hy1vOTMzDvOe/Yuwb5nX4aCZjO3j9tFInJ9noh05N1zYZFNDisRFrJmlSFpGHv cxQCMOPzDC6zpeUpwkxX+16HIVUwhHuYVJWIJ0pv31ZnSvr5NJHymPvjciYnVQ== 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 4X2dWc5jcrzHdR; Mon, 9 Sep 2024 20:21:00 +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 489KL0Vk078232; Mon, 9 Sep 2024 20:21:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 489KL0Gi078229; Mon, 9 Sep 2024 20:21:00 GMT (envelope-from git) Date: Mon, 9 Sep 2024 20:21:00 GMT Message-Id: <202409092021.489KL0Gi078229@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Igor Ostapenko Subject: git: 8739d155b4 - main - documentation/tools: Make *key.sh more portable List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8739d155b4416c7a2f68085cc76c5400ea06cffe Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/doc/commit/?id=8739d155b4416c7a2f68085cc76c5400ea06cffe commit 8739d155b4416c7a2f68085cc76c5400ea06cffe Author: Igor Ostapenko AuthorDate: 2024-09-09 20:10:12 +0000 Commit: Igor Ostapenko CommitDate: 2024-09-09 20:18:02 +0000 documentation/tools: Make *key.sh more portable POSIX does not include ";&" as a case fallthrough syntax. Reviewed by: kp, des, markj Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D46453 --- documentation/tools/addkey.sh | 15 ++++++++------- documentation/tools/checkkey.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/documentation/tools/addkey.sh b/documentation/tools/addkey.sh index 9b77bdf4df..776aeee40c 100755 --- a/documentation/tools/addkey.sh +++ b/documentation/tools/addkey.sh @@ -73,19 +73,20 @@ if [ $# -ne 0 ] ; then case $(expr "${arg}" : '^[0-9A-Fa-f]\{8,16\}$') in 8) warning "${arg}: recommend using 16-digit keyid" - ;& + ;; 16) - keyid=$(getkeybyid "${arg}") - if [ -n "${keyid}" ] ; then - keyids="${keyids} ${keyid}" - else - warning "${arg} not found" - fi ;; *) warning "${arg} does not appear to be a valid key ID" + continue ;; esac + keyid=$(getkeybyid "${arg}") + if [ -n "${keyid}" ] ; then + keyids="${keyids} ${keyid}" + else + warning "${arg} not found" + fi done else # Search for keys by freebsd.org email diff --git a/documentation/tools/checkkey.sh b/documentation/tools/checkkey.sh index c4772f13b3..8740a5dde6 100755 --- a/documentation/tools/checkkey.sh +++ b/documentation/tools/checkkey.sh @@ -105,20 +105,20 @@ if [ $# -ne 0 ] ; then case $(expr "${arg}" : '^[0-9A-Fa-f]\{8,16\}$') in 8) warning "${arg}: recommend using 16-digit keyid" - ;& + ;; 16) - keyid=$(getkeybyid "${arg}") - if [ -n "${keyid}" ] ; then - keyids="${keyids} ${keyid}" - else - warning "${arg} not found" - fi ;; *) warning "${arg} does not appear to be a valid key ID" + continue ;; esac - shift + keyid=$(getkeybyid "${arg}") + if [ -n "${keyid}" ] ; then + keyids="${keyids} ${keyid}" + else + warning "${arg} not found" + fi done else # Search for keys by freebsd.org email