From: Henri Rosten <henri.rosten@unikie.com>
To: Alyssa Ross <alyssa.ross@unikie.com>
Cc: devel@spectrum-os.org
Subject: Re: [PATCH 1/2] scripts: fix shellcheck warnings
Date: Thu, 10 Nov 2022 15:38:53 +0200 [thread overview]
Message-ID: <20221110133853.GA1064381@buamix> (raw)
In-Reply-To: <20221110112219.459660-1-alyssa.ross@unikie.com>
On Thu, Nov 10, 2022 at 11:22:19AM +0000, Alyssa Ross wrote:
> Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
Reviewed-by: Henri Rosten <henri.rosten@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
>
next prev parent reply other threads:[~2022-11-10 13:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 11:22 Alyssa Ross
2022-11-10 11:22 ` [PATCH 2/2] release.nix: run shellcheck on build scripts Alyssa Ross
2022-11-10 13:40 ` Henri Rosten
2022-11-11 14:28 ` Alyssa Ross
2022-11-10 13:38 ` Henri Rosten [this message]
2022-11-11 14:28 ` [PATCH 1/2] scripts: fix shellcheck warnings Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221110133853.GA1064381@buamix \
--to=henri.rosten@unikie.com \
--cc=alyssa.ross@unikie.com \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).