From 0b4cab2af9db54423fa842a91242b76eb381bb88 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.com>
Date: Wed, 13 Oct 2021 08:30:16 +0100
Subject: [PATCH] make-recovery-images: Set GID

---
 imager/make-recovery-images | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/imager/make-recovery-images b/imager/make-recovery-images
index 4c70de8..59f2981 100755
--- a/imager/make-recovery-images
+++ b/imager/make-recovery-images
@@ -15,12 +15,12 @@ cleanup() {
 
 trap cleanup EXIT
 
-[ "$(id -u)" = "0" ] || die "Must be run as root"
-[ -n ${SUDO_UID} ] || die "SUDO_UID not defined"
+[ "$(id -u)" = "0" ] || die "$(basename $0) must be run as root"
+[ -n "${SUDO_UID}" ] || die "SUDO_UID not defined"
+[ -n "${SUDO_GID}" ] || die "SUDO_GID not defined"
 
-mkdir -p images
-chown ${SUDO_UID} images
-for src in $(ls release); do
+for src in release/*.zip; do
+   src=$(basename "${src}")
    img=$(echo "${src}" | sed 's/\.zip/.img/')
    TMP_DIR=$(mktemp -d)
    (
@@ -50,9 +50,11 @@ EOF
       umount fs
       kpartx -dv temp.img
    )
+   mkdir -p images
+   chown "${SUDO_UID}:${SUDO_GID}" images
    mv "${TMP_DIR}/temp.img" "images/${img}"
    file "images/${img}"
    zip "images/${src}" "images/${img}"
    rm "images/${img}"
-   chown ${SUDO_UID} "images/${src}"
+   chown "${SUDO_UID}:${SUDO_GID}" "images/${src}"
 done