From 8dd371511006e2e63912a9750134a3b002dc41f2 Mon Sep 17 00:00:00 2001
From: Lars Frost <larsf@fsmpi.rwth-aachen.de>
Date: Fri, 7 Oct 2022 14:03:36 +0200
Subject: [PATCH] Make assemble_image more independent of environment
---
assemble_image.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/assemble_image.sh b/assemble_image.sh
index 3bb1d48..d0da89e 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -8,7 +8,7 @@ WORKSPACE="workspace"
REBUILD_CALAMARES=1
# Helpers
-REGULAR_USER="${SUDO_USER:-${USER}}"
+REGULAR_USER="${SUDO_USER:-${DOAS_USER:-$USER}}"
REGULAR_USER_HOME=$(getent passwd "$REGULAR_USER" | cut -d: -f6)
ISO_PROFILES_REPO="$REGULAR_USER_HOME/iso-profiles"
PROFILE="$ISO_PROFILES_REPO/osak/lip"
@@ -145,8 +145,8 @@ install_custom_calamares() {
mkdir -p "$BUILD_DIR"
cp "calamares/PKGBUILD" "$BUILD_DIR"
cd "$BUILD_DIR"
- chown lars:lars -R .
- doas -u lars makepkg
+ chown "$REGULAR_USER:$REGULAR_USER" -R .
+ doas -u "$REGULAR_USER" makepkg
cd -
rsync -a "$BUILD_DIR"/ "$CACHE"
fi
@@ -170,4 +170,6 @@ set -e
mv /var/cache/manjaro-tools/iso/osak/lip/*/*.iso "$WORKSPACE"
+chown "$REGULAR_USER:$REGULAR_USER" -R "$WORKSPACE"
+
# vim: tabstop=2 shiftwidth=2 expandtab
--
GitLab