[PATCH 1/2] scripts: fix shellcheck warnings

Alyssa Ross
2022-11-10T11:23:45Z

Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
---

Henri, I've CCed you on this series, in case you'd like to review.
We have some documentation on reviewing patches here:

https://spectrum-os.org/doc/development/reviewing-patches.html

scripts/format-uuid.sh | 12 ++++++------
scripts/make-gpt.sh | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/format-uuid.sh b/scripts/format-uuid.sh
index 6758088..441ed64 100755
--- a/scripts/format-uuid.sh
+++ b/scripts/format-uuid.sh
@@ -8,12 +8,12 @@ substr () {
str=$1
beg=$2
end=$3
- echo $str | cut -c $beg-$end
+ 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)
+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 3215edb..554182f 100755
--- a/scripts/make-gpt.sh
+++ b/scripts/make-gpt.sh
@@ -23,7 +23,7 @@ sizeMiB() {
fillPartition() {
sfdisk -J "$1" | jq -r --argjson index "$2" \
'.partitiontable.partitions[$index] | "\(.start) \(.size)"' |
- (read start size;
+ (read -r start size;
dd if="$3" of="$1" seek="$start" count="$size" conv=notrunc)
}

@@ -48,7 +48,7 @@ gptBytes=$TWO_MiB
for partition; do
sizeMiB="$(sizeMiB "$(partitionPath "$partition")")"
table="$table${nl}size=${sizeMiB}MiB,$(awk -f "$scriptsDir/sfdisk-field.awk" -v partition="$partition")"
- gptBytes="$(expr "$gptBytes" + "$sizeMiB" \* $ONE_MiB)"
+ gptBytes="$((gptBytes + sizeMiB * ONE_MiB))"
done

rm -f "$out"
@@ -60,5 +60,5 @@ EOF
n=0
for partition; do
fillPartition "$out" "$n" "$(partitionPath "$partition")"
- n="$(expr "$n" + 1)"
+ n="$((n + 1))"
done
--
2.35.1