From 0518a9fbc8ec03e12c2e9d98e3a02932cf964666 Mon Sep 17 00:00:00 2001
From: Lars Frost <larsf@fsmpi.rwth-aachen.de>
Date: Wed, 5 Oct 2022 17:56:17 +0200
Subject: [PATCH] Make references to workspace respect variable
---
assemble_image.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/assemble_image.sh b/assemble_image.sh
index 88e47df..ae18e31 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -14,9 +14,9 @@ ISO_PROFILES_REPO="$REGULAR_USER_HOME/iso-profiles"
PROFILE="$ISO_PROFILES_REPO/osak/lip"
rm -rf "$ISO_PROFILES_REPO"
-rm -rf workspace
-mkdir workspace
-chmod a+rx workspace
+rm -rf "$WORKSPACE"
+mkdir "$WORKSPACE"
+chmod a+rx "$WORKSPACE"
git clone --depth 1 https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git "$ISO_PROFILES_REPO"
mkdir -p "$PROFILE"
rsync -a --copy-links "$ISO_PROFILES_REPO/manjaro/kde/" "$PROFILE"
@@ -131,7 +131,7 @@ install_custom_calamares() {
local CACHE="${XDG_CACHE_HOME:-"$HOME/.cache"}/lip-build/calamares-build"
if [ "$REBUILD_CALAMARES" -ne 0 ] || ! ls "$CACHE"/calamares*.pkg.tar.* > /dev/null 2&>1
then
- local BUILD_DIR="workspace/calamares-build"
+ local BUILD_DIR="$WORKSPACE/calamares-build"
mkdir -p "$BUILD_DIR"
cp "calamares/PKGBUILD" "$BUILD_DIR"
cd "$BUILD_DIR"
--
GitLab