patches and low-level development discussion
 help / color / mirror / code / Atom feed
* [PATCH v3] Remove bashisms from spectrum shell scripts
@ 2022-11-09 13:27 Henri Rosten
  2022-11-10  8:18 ` Alyssa Ross
  0 siblings, 1 reply; 2+ messages in thread
From: Henri Rosten @ 2022-11-09 13:27 UTC (permalink / raw)
  To: devel; +Cc: Henri Rosten

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 <henri.rosten@unikie.com>
---
 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 <hi@alyssa.is>
+# 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 <hi@alyssa.is>
+# 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 <hi@alyssa.is>
+# 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




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] Remove bashisms from spectrum shell scripts
  2022-11-09 13:27 [PATCH v3] Remove bashisms from spectrum shell scripts Henri Rosten
@ 2022-11-10  8:18 ` Alyssa Ross
  0 siblings, 0 replies; 2+ messages in thread
From: Alyssa Ross @ 2022-11-10  8:18 UTC (permalink / raw)
  To: Henri Rosten; +Cc: devel

[-- Attachment #1: Type: text/plain, Size: 796 bytes --]

On Wed, Nov 09, 2022 at 03:27:30PM +0200, Henri Rosten wrote:
> 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 <henri.rosten@unikie.com>
> ---
>  Documentation/scripts/undocumented-uuids.sh |  9 +++++++--
>  scripts/format-uuid.sh                      | 15 ++++++++++++++-
>  scripts/make-gpt.sh                         |  4 +++-
>  3 files changed, 24 insertions(+), 4 deletions(-)

Applied as 8e28cc80b14b613247d953c35dc76ef0b864eb33, thank you!

And thanks for fixing the path in undocumented-uuids.sh.
One small thing for next time: I'd rather fixes like that were part of
their own commit, with their own explanation.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-11-10  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-09 13:27 [PATCH v3] Remove bashisms from spectrum shell scripts Henri Rosten
2022-11-10  8:18 ` Alyssa Ross

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).