From 4629bc6f7785bbeb3c5e847a5ef0a9c9108a761b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@umlautT.umlaeute.mur.at>
Date: Tue, 26 Sep 2023 11:22:39 +0200
Subject: [PATCH 1/3] Add BASE_APT_CLEAN config to (prevent) cleanup of
 apt-cache

---
 src/modules/base/config            | 4 ++++
 src/modules/base/end_chroot_script | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/base/config b/src/modules/base/config
index 22014a7d..5fbbf154 100644
--- a/src/modules/base/config
+++ b/src/modules/base/config
@@ -107,3 +107,7 @@ fi
 
 # Enable uart console on boot
 [ -n "$BASE_ENABLE_UART" ] || BASE_ENABLE_UART=no
+
+
+# Clean apt-cache after all the work is done
+: ${BASE_APT_CLEAN:=yes}
diff --git a/src/modules/base/end_chroot_script b/src/modules/base/end_chroot_script
index 0b7039f6..37b21c72 100755
--- a/src/modules/base/end_chroot_script
+++ b/src/modules/base/end_chroot_script
@@ -39,5 +39,7 @@ if [ "${BASE_DISTRO}" == "ubuntu" ];then
 fi
 
 #cleanup
-apt-get clean
+if [ "${BASE_APT_CLEAN}" = "yes" ]; then
+    apt-get clean
+fi
 apt-get autoremove -y

From b71dbf8e35ae47b1e3b50663bf90293421ee6216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@umlautT.umlaeute.mur.at>
Date: Tue, 26 Sep 2023 11:25:22 +0200
Subject: [PATCH 2/3] modules/base: use POSIX string comparision

---
 src/modules/base/config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/base/config b/src/modules/base/config
index 5fbbf154..117994aa 100644
--- a/src/modules/base/config
+++ b/src/modules/base/config
@@ -16,7 +16,7 @@ BASE_VERSION=1.5.0
 [ -n "$BASE_DISTRO" ] || BASE_DISTRO=raspbian
 
 # Note: Set BASE_ZIP_IMG relative to the distro/src/workspace directory to pass a custom named file or an already extracted '.img'-file.
-if [ "${BASE_DISTRO}" == "ubuntu" ]; then
+if [ "${BASE_DISTRO}" = "ubuntu" ]; then
     # Default image ubuntu
     [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/ubuntu-*.xz | head -n 1`
     # Default user ubuntu
@@ -28,7 +28,7 @@ if [ "${BASE_DISTRO}" == "ubuntu" ]; then
     [ -n "$BASE_USER_PASSWORD" ] || BASE_USER_PASSWORD=ubuntu
 else
     # Default image raspbian
-    if [ "${BASE_DISTRO}" == "raspios64" ]; then
+    if [ "${BASE_DISTRO}" = "raspios64" ]; then
         [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}-*-arm64-*.{zip,7z,xz} | head -n 1`
     else
         [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}*.{zip,7z,xz} | head -n 1`
@@ -49,7 +49,7 @@ fi
 # [ -n "$BASE_CHROOT_SCRIPT_PATH" ] || BASE_CHROOT_SCRIPT_PATH=$BASE_SCRIPT_PATH/chroot_script
 [ -n "$BASE_MOUNT_PATH" ] || BASE_MOUNT_PATH=$BASE_WORKSPACE/mount
 
-if [ "${BASE_DISTRO}" == "ubuntu" ]; then
+if [ "${BASE_DISTRO}" = "ubuntu" ]; then
   [ -n "${BASE_BOOT_MOUNT_PATH}" ] || BASE_BOOT_MOUNT_PATH=boot/firmware
 else
   [ -n "${BASE_BOOT_MOUNT_PATH}" ] || BASE_BOOT_MOUNT_PATH=boot

From c9c3af5b406de2d2de492ca7d0b8d6844b855d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@umlautT.umlaeute.mur.at>
Date: Tue, 26 Sep 2023 11:26:14 +0200
Subject: [PATCH 3/3] modules/base: use $() instead of ``

and use git's "-C" flag to chdir into a directory rather than pushd/popd
---
 src/modules/base/config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/base/config b/src/modules/base/config
index 117994aa..880a6a1f 100644
--- a/src/modules/base/config
+++ b/src/modules/base/config
@@ -18,7 +18,7 @@ BASE_VERSION=1.5.0
 # Note: Set BASE_ZIP_IMG relative to the distro/src/workspace directory to pass a custom named file or an already extracted '.img'-file.
 if [ "${BASE_DISTRO}" = "ubuntu" ]; then
     # Default image ubuntu
-    [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/ubuntu-*.xz | head -n 1`
+    [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=$(ls -t $BASE_IMAGE_PATH/ubuntu-*.xz | head -n 1)
     # Default user ubuntu
     [ -n "$BASE_USER" ] || BASE_USER=ubuntu
     
@@ -29,9 +29,9 @@ if [ "${BASE_DISTRO}" = "ubuntu" ]; then
 else
     # Default image raspbian
     if [ "${BASE_DISTRO}" = "raspios64" ]; then
-        [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}-*-arm64-*.{zip,7z,xz} | head -n 1`
+        [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=$(ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}-*-arm64-*.{zip,7z,xz} | head -n 1)
     else
-        [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}*.{zip,7z,xz} | head -n 1`
+        [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=$(ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}*.{zip,7z,xz} | head -n 1)
     fi
     # Default user raspbian
     [ -n "$BASE_USER" ] || BASE_USER=pi
@@ -85,7 +85,7 @@ fi
 [ -n "$BASE_SSH_ENABLE" ] || BASE_SSH_ENABLE=yes
 
 #Store the commit used for CustomPiOS
-[ -n "$BASE_COMMIT" ] || BASE_COMMIT=`pushd "${CUSTOM_PI_OS_PATH}" > /dev/null ; git rev-parse HEAD ; popd > /dev/null`
+[ -n "$BASE_COMMIT" ] || BASE_COMMIT=$(git -C "${CUSTOM_PI_OS_PATH}" rev-parse HEAD)
 
 #Memory split
 [ -n "$BASE_CONFIG_MEMSPLIT" ] || BASE_CONFIG_MEMSPLIT=default