Skip to content

Commit 71f03cf

Browse files
roliver-rpitdewey-rpi
authored andcommitted
rpi-package-download: POSIX sh compatible
Signed-off-by: Richard Oliver <[email protected]>
1 parent b07d13f commit 71f03cf

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

rpi-package-download/rpi-package-download

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22

33
set -e
44

@@ -20,12 +20,12 @@ RELEASE="${RELEASE:-bookworm}"
2020
ARCH="${ARCH:-arm64}"
2121

2222
# Should be set by systemd
23-
SERVICE_NAME="rpi-package-download@$(systemd-escape ${REQUESTED_PACKAGE}).service"
23+
SERVICE_NAME="rpi-package-download@$(systemd-escape "${REQUESTED_PACKAGE}").service"
2424
CACHE_DIRECTORY="${CACHE_DIRECTORY:=/var/cache/${SERVICE_NAME}}"
2525
RUNTIME_DIRECTORY="${RUNTIME_DIRECTORY:=/run/${SERVICE_NAME}}"
2626

2727
# Assume that [email protected] RUNTIME_DIRECTORY is available relative to our RUNTIME_DIRECTORY
28-
PACKAGES_FILE="${RUNTIME_DIRECTORY}/../fetch-repo-package-list@$(systemd-escape ${REPOSITORY}).service/Packages"
28+
PACKAGES_FILE="${RUNTIME_DIRECTORY}/../fetch-repo-package-list@$(systemd-escape "${REPOSITORY}").service/Packages"
2929

3030
>&2 echo "Getting latest package information for ${REQUESTED_PACKAGE}"
3131
TMP_PKG_FILE="$(mktemp --tmpdir rpi-package-downloader.XXX)"
@@ -34,23 +34,23 @@ grep-dctrl \
3434
--field=Package \
3535
--exact-match "${REQUESTED_PACKAGE}" \
3636
"${PACKAGES_FILE}" \
37-
> ${TMP_PKG_FILE}
37+
> "${TMP_PKG_FILE}"
3838

3939
LATEST_DIR="${RUNTIME_DIRECTORY}/latest"
4040
LATEST_PKG_FILE="${LATEST_DIR}/Package"
4141

42-
if cmp ${TMP_PKG_FILE} ${LATEST_PKG_FILE} 2>/dev/null; then
42+
if cmp "${TMP_PKG_FILE}" "${LATEST_PKG_FILE}" 2>/dev/null; then
4343
>&2 echo "Package up-to-date; nothing to do"
4444
exit
4545
fi
4646

47-
CHKSUM=$(sha1sum ${TMP_PKG_FILE} | cut -d " " -f 1)
47+
CHKSUM=$(sha1sum "${TMP_PKG_FILE}" | cut -d " " -f 1)
4848
WORK_DIR="${CACHE_DIRECTORY}/${CHKSUM}"
49-
mkdir -p $WORK_DIR
49+
mkdir -p "$WORK_DIR"
5050
PACKAGE_FILE="${WORK_DIR}/Packages"
5151
mv "$TMP_PKG_FILE" "$PACKAGE_FILE"
5252

53-
function get_dctrl_field() {
53+
get_dctrl_field() {
5454
grep-dctrl \
5555
--field=Package \
5656
--exact-match "${1}" \
@@ -59,18 +59,18 @@ function get_dctrl_field() {
5959
"${PACKAGE_FILE}"
6060
}
6161

62-
PACKAGE_PARTIAL_URL="$(get_dctrl_field ${REQUESTED_PACKAGE} Filename)"
62+
PACKAGE_PARTIAL_URL="$(get_dctrl_field "${REQUESTED_PACKAGE}" Filename)"
6363
PACKAGE_FULL_URL="${REPOSITORY}/${PACKAGE_PARTIAL_URL}"
64-
PACKAGE_BASENAME="$(basename ${PACKAGE_PARTIAL_URL})"
64+
PACKAGE_BASENAME="$(basename "${PACKAGE_PARTIAL_URL}")"
6565

6666
>&2 echo "Downloading package"
6767
curl \
6868
"${PACKAGE_FULL_URL}" \
6969
-o "${WORK_DIR}/${PACKAGE_BASENAME}" \
7070
2> /dev/null
7171

72-
>&2 echo -n "Verifying package checksum: "
73-
pushd "${WORK_DIR}" > /dev/null
72+
>&2 printf "Verifying package checksum: "
73+
cd "${WORK_DIR}"
7474
grep-dctrl \
7575
--field=Package \
7676
--exact-match "${REQUESTED_PACKAGE}" \
@@ -79,7 +79,7 @@ grep-dctrl \
7979
"${PACKAGE_FILE}" | sed 's/.*\///' | xargs > "${PACKAGE_BASENAME}.sha256"
8080

8181
sha256sum --check "${PACKAGE_BASENAME}".sha256
82-
popd > /dev/null
82+
cd -
8383

8484
>&2 echo "Updating symlinks"
8585
ln -sf "${WORK_DIR}/${PACKAGE_BASENAME}" "${WORK_DIR}/package.deb"

0 commit comments

Comments
 (0)