From d60abe962dc05210ab142d1832642fff46549eba Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Tue, 23 Sep 2025 14:42:53 -0400
Subject: [PATCH] Minor code improvements and cleanup

---
 CHANGELOG     |  1 +
 bastille-init |  6 +++---
 unionfs.sh    | 40 +++++++++++++++++++++++++++++++---------
 version       |  2 +-
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 96f793b..f296b60 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.2.10......Minor code improvements and cleanup.
 1.2.09......Add Debian keyring and minor code changes.
 1.2.08......Code cleanup, remove unnecessary statement. 
 1.2.07......Minor cosmetic/wording changes.
diff --git a/bastille-init b/bastille-init
index f014c1e..73c2106 100644
--- a/bastille-init
+++ b/bastille-init
@@ -1568,9 +1568,9 @@ bootstrap_dist()
 		# Disable debootstrap environment.
 		${CWDIR}/unionfs.sh unionfs_off
 
-		else
-			echo "Linux compatibility disabled."
-			exit 1
+	else
+		echo "Linux compatibility disabled."
+		exit 1
 	fi
 
 	exit 0
diff --git a/unionfs.sh b/unionfs.sh
index 9ccc38e..c01a004 100644
--- a/unionfs.sh
+++ b/unionfs.sh
@@ -52,6 +52,7 @@ error_notify() {
 	MSG="${*}"
 	logger -t "${SCRIPTNAME}" "${MSG}"
 	echo -e "${MSG}" >&2
+	unionfs_disable
 	exit 1
 }
 
@@ -105,6 +106,31 @@ unload_kmods() {
 	fi
 }
 
+unionfs_disable() {
+	# Check and disable uniofs mounts on error.
+	unionfs_pkgoff
+	unionfs_off
+}
+
+unionfs_pkgon() {
+	if ! df | grep -q "${CWDIR}/system/var/db/pkg"; then
+		echo "Enabling UnionFS for ${CWDIR}/system/var/db/pkg."
+		mount_unionfs -o avobe ${CWDIR}/system/var/db/pkg /var/db/pkg
+	fi
+}
+
+unionfs_pkgoff() {
+	if df | grep -q "${CWDIR}/system/var/db/pkg"; then
+		echo "Disabling UnionFS for ${CWDIR}/system/var/db/pkg."
+		umount -f /var/db/pkg
+	fi
+}
+
+fetch_cmd() {
+	PKG_LIST="debootstrap debian-keyring"
+	pkg fetch -y -d -o ${CWDIR}/system/ ${PKG_LIST}
+}
+
 fetch_pkg() {
 	if [ ! -d "/var/db/pkg" ]; then
 		mkdir -p "/var/db/pkg"
@@ -113,20 +139,16 @@ fetch_pkg() {
 		mkdir -p ${CWDIR}/system/var/db/pkg
 	fi
 
-	if ! df | grep -q "${CWDIR}/system/var/db/pkg"; then
-		echo "Enabling UnionFS for ${CWDIR}/system/var/db/pkg."
-		mount_unionfs -o avobe ${CWDIR}/system/var/db/pkg /var/db/pkg
-	fi
+	unionfs_pkgon
 
 	echo "Fetching required packages."
 	# Fetch deboostrap and dependency packages.
-	pkg fetch -y -d -o ${CWDIR}/system/ debootstrap debian-keyring || error_notify "Error while fetching packages, exiting."
+	fetch_cmd || echo "Cleaning addon stale pkg db"
+	rm -rf ${CWDIR}/system/var/db/pkg/*
+	fetch_cmd || error_notify "Error while fetching packages, exiting."
 	echo "Done."
 
-	if df | grep -q "${CWDIR}/system/var/db/pkg"; then
-		echo "Disabling UnionFS for ${CWDIR}/system/var/db/pkg."
-		umount -f /var/db/pkg
-	fi
+	unionfs_pkgoff
 
 	extract_pkg
 }
diff --git a/version b/version
index 5ee34e6..963ed7c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.09
+1.2.10