Skip to content

Commit

Permalink
scripts: download-check-artifact.sh: fix shellcheck and improve
Browse files Browse the repository at this point in the history
Fixes following shellcheck's recommendations:

 In scripts/download-check-artifact.sh line 24:
	exit $1
             ^-- SC2086 (info): Double quote to prevent globbing and word splitting.

 In scripts/download-check-artifact.sh line 53:
		local sum="$(shasum -a 256 "$image_file")";
                      ^-^ SC2155 (warning): Declare and assign separately to avoid masking return values.

 In scripts/download-check-artifact.sh line 72:
 cd "/tmp/verify.$$"
 ^-----------------^ SC2164 (warning): Use 'cd ... || exit' or 'cd ... || return' in case cd fails.

 In scripts/download-check-artifact.sh line 114:
		printf "Keyserver to use? [$keyserver_url] > "
                       ^-- SC2059 (info): Don't use variables in the printf format string. Use printf '..%s..' "$foo".

 In scripts/download-check-artifact.sh line 115:
		read url; case "${url:-$keyserver_url}" in
                ^--^ SC2162 (info): read without -r will mangle backslashes.

While at it make it clear, that it is possible to download/check any
build artifacts like even SDK or ImageBuilder.

Link: openwrt#16871
Signed-off-by: Petr Štetiar <[email protected]>
  • Loading branch information
ynezz authored and vincejv committed Nov 14, 2024
1 parent 616d8a1 commit 84c3ce8
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions scripts/download-check-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# 255 - A suitable download or checksum utility is missing

[ -n "$1" ] || {
echo "$0 - Download and verify build artifacts"
echo "Usage: $0 <url>" >&2
exit 1
}
Expand All @@ -21,7 +22,7 @@ finish() {
echo "Cleaning up."
rm -r "/tmp/verify.$$"
}
exit $1
exit "$1"
}

trap "finish 254" INT TERM
Expand Down Expand Up @@ -50,7 +51,8 @@ if which sha256sum >/dev/null; then
checksum() { sha256sum -c --ignore-missing "sha256sums"; }
elif which shasum >/dev/null; then
checksum() {
local sum="$(shasum -a 256 "$image_file")";
local sum
sum="$(shasum -a 256 "$image_file")";
grep -xF "${sum%% *} *$image_file" "sha256sums";
}
else
Expand All @@ -68,11 +70,14 @@ else
}
fi

mkdir -p "/tmp/verify.$$"
cd "/tmp/verify.$$"
tmpdir="$(mktemp -d)"
cd "$tmpdir" || {
echo "Failed to create temporary directory!" >&2
finish 255
}

echo ""
echo "1) Downloading image file"
echo "1) Downloading artifact file"
echo "========================="
download "$image_file" "$image_url" || {
echo "Failed to download image file!" >&2
Expand Down Expand Up @@ -111,8 +116,8 @@ if [ -n "$missing_key" ]; then
echo "" >&2

while true; do
printf "Keyserver to use? [$keyserver_url] > "
read url; case "${url:-$keyserver_url}" in
printf 'Keyserver to use? [%s] > ' "$keyserver_url"
read -r url; case "${url:-$keyserver_url}" in
hkp://*)
gpg --keyserver "${url:-$keyserver_url}" --recv-keys "$missing_key" || {
echo "Failed to download public key." >&2
Expand Down Expand Up @@ -148,7 +153,7 @@ cp "$image_file" "$destdir/$image_file" || {
echo ""
echo "Verification done!"
echo "=================="
echo "Firmware image placed in '$destdir/$image_file'."
echo "Downloaded artifact placed in '$destdir/$image_file'."
echo ""

finish 0

0 comments on commit 84c3ce8

Please sign in to comment.