From b5611e9196eba458c7736210110aee4af77b15e3 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Sat, 1 Mar 2025 20:03:03 -0700
Subject: [PATCH] common: Load config as variable

---
 usr/local/share/bastille/common.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh
index ddc00a91..262e6ecf 100644
--- a/usr/local/share/bastille/common.sh
+++ b/usr/local/share/bastille/common.sh
@@ -44,13 +44,8 @@ bastille_root_check() {
 }
 
 load_config() {
-    _user="$(id -un)"
-	if [ "${_user}" != "root" ] && [ -r "/usr/local/etc/bastille/bastille_${_user}.conf" ]; then
-            # shellcheck disable=SC1090
-	    . /usr/local/etc/bastille/bastille_${_user}.conf
-	else
-	    . /usr/local/etc/bastille/bastille.conf
-	fi
+    # shellcheck disable=SC1090
+    . ${BASTILLE_CONFIG}
 }
 
 # Load configuration file