From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 1AD0122B3A; Wed, 9 Nov 2022 13:27:48 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 5D09C22AC1; Wed, 9 Nov 2022 13:27:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,LOTS_OF_MONEY,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by atuin.qyliss.net (Postfix) with ESMTPS id 988AF22AC0 for ; Wed, 9 Nov 2022 13:27:43 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id d20so25726326ljc.12 for ; Wed, 09 Nov 2022 05:27:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pQ1k9tUUOQlkIgR+r7ymv73ItZdPO2QaOVz90VLt45Q=; b=YRhTsgIKwc/aYFf81VK/FdKR4Cymb+8608XjobIkpsknEG7nYjPwHoo///DLQHQKM0 dsx6FPWD5bkIHwBv/H5h3r0qdNalqdJtCGIbUOQOveAl63sKYZ8poqSFxMbaEiZWEjg9 AsqXNu7PkaoFrTK/Nf14J7U30YVMMijUZYotTZmbiwnt6UW0jYZz0dXKt/v+i7E9Gw9v lYMI5PLPYxRZ2AmXKux6ZwtoFDzxxp39S1fEPs8IwWQEPbRadZqdYuE1dvLEyqMY2aXK bcUvzi8uOyAgIfLKRqzqX9UgvHSvnxUjzdnFenbFgq8OZ66Ow/AWmmzx97MX2OeNYimQ jOHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pQ1k9tUUOQlkIgR+r7ymv73ItZdPO2QaOVz90VLt45Q=; b=aYATqPPQ/75Q3jQCXm5oyhZtos/MNhi5MHgTBMhrta20H0rTTlOUjZlidPZs1dUq+S dn6/Ro/shirwbq34FGySrPoggiGBPC7oIPkTOc2osroQHqsL3i17HJLak1Eqs4MVkJBx 1gv/8wN8m/7tcztmLLMafUnJRMXFbitD9qfnyBll0CJqTn63NFffxgzmV8MeMiKfljV6 9+caBXni4qvw+hFkybANdR1YRcX42nCT+5RvuoM25I6+344KE3TpQ2HtmgGGQIlOmdB3 DF6Lu8J6O6ucdNJusYrmNZxR356BH0JyEoLnXtnqiAo3PXWWUO6qV1BwL8gyk72bN38y U0zQ== X-Gm-Message-State: ACrzQf1fpCCDTFUClmMPLqkyUd6yuAPEC91zJmSzRkrQzxUudCCkzKQD 7bZOztRXpA/TYwHUxWgWG6sb2Vle9ITW+g== X-Google-Smtp-Source: AMsMyM75hTrkTUxc0laI0ODycEi3+EBISZR9MzvpdVxmXhuQVoQ5MeW9Xh+cHAQ3lvcyGL8V+nmGNg== X-Received: by 2002:a2e:850f:0:b0:277:309:f1ad with SMTP id j15-20020a2e850f000000b002770309f1admr7978445lji.244.1668000462541; Wed, 09 Nov 2022 05:27:42 -0800 (PST) Received: from buamix.lan (86-60-162-79.dynamic.lounea.fi. [86.60.162.79]) by smtp.gmail.com with ESMTPSA id u27-20020ac25bdb000000b004a9b9ccfbe6sm2217731lfn.51.2022.11.09.05.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 05:27:42 -0800 (PST) From: Henri Rosten To: devel@spectrum-os.org Subject: [PATCH v3] Remove bashisms from spectrum shell scripts Date: Wed, 9 Nov 2022 15:27:30 +0200 Message-Id: <20221109132730.941054-1-henri.rosten@unikie.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6Z2DTZ2ZR7I3BHYNMOO3JGZ27OVWTXGA X-Message-ID-Hash: 6Z2DTZ2ZR7I3BHYNMOO3JGZ27OVWTXGA X-MailFrom: henri.rosten@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Henri Rosten X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-TUID: 9XE4dvG8SdOg This commit removes bashisms from spectrum shell scripts. This change is needed to be able to use the scripts from POSIX-compliant shells which are not bash compatible - such as dash. Signed-off-by: Henri Rosten --- Documentation/scripts/undocumented-uuids.sh | 9 +++++++-- scripts/format-uuid.sh | 15 ++++++++++++++- scripts/make-gpt.sh | 4 +++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Documentation/scripts/undocumented-uuids.sh b/Documentation/scripts/undocumented-uuids.sh index 34c2d22..c75bfd2 100755 --- a/Documentation/scripts/undocumented-uuids.sh +++ b/Documentation/scripts/undocumented-uuids.sh @@ -1,14 +1,19 @@ #!/bin/sh -eu # SPDX-FileCopyrightText: 2022 Alyssa Ross +# SPDX-FileCopyrightText: 2022 Unikie # SPDX-License-Identifier: EUPL-1.2+ cd "$(dirname "$0")/../.." PATTERN='\b[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}\b' -UUID_REFERENCE_PATH=Documentation/uuid-reference.adoc +UUID_REFERENCE_PATH=Documentation/appendices/uuid-reference.adoc +documented_uuids=$(mktemp) +trap 'rm -f -- "$documented_uuids"' EXIT + +grep -Eio "$PATTERN" "$UUID_REFERENCE_PATH" | sort -u >"$documented_uuids" git ls-files -coz --exclude-standard | grep -Fxvz "$UUID_REFERENCE_PATH" | xargs -0 git grep -Ehio --no-index --no-line-number "$PATTERN" -- | sort -u | - comm -23 - <(grep -Eio "$PATTERN" "$UUID_REFERENCE_PATH" | sort -u) + comm -23 - "$documented_uuids" diff --git a/scripts/format-uuid.sh b/scripts/format-uuid.sh index fa07eb9..6758088 100755 --- a/scripts/format-uuid.sh +++ b/scripts/format-uuid.sh @@ -1,6 +1,19 @@ #!/bin/sh -eu # # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross +# SPDX-FileCopyrightText: 2022 Unikie # SPDX-License-Identifier: EUPL-1.2+ -printf "%s\n" "${1:0:8}-${1:8:4}-${1:12:4}-${1:16:4}-${1:20}" +substr () { + str=$1 + beg=$2 + end=$3 + echo $str | cut -c $beg-$end +} + +u1=$(substr $1 1 8) +u2=$(substr $1 9 12) +u3=$(substr $1 13 16) +u4=$(substr $1 17 20) +u5=$(substr $1 21 32) +printf "%s\n" "$u1-$u2-$u3-$u4-$u5" diff --git a/scripts/make-gpt.sh b/scripts/make-gpt.sh index 56076d3..3215edb 100755 --- a/scripts/make-gpt.sh +++ b/scripts/make-gpt.sh @@ -1,6 +1,7 @@ #!/bin/sh -eu # # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross +# SPDX-FileCopyrightText: 2022 Unikie # SPDX-License-Identifier: EUPL-1.2+ # # usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID]... @@ -38,7 +39,8 @@ scriptsDir="$(dirname "$0")" out="$1" shift -nl=$'\n' +nl=' +' table="label: gpt" # Keep 1MiB free at the start, and 1MiB free at the end. -- 2.25.1