From 57e6ab40dae18a2476e7b75503ddab64dc87eae8 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Sat, 17 May 2025 19:04:47 -0600
Subject: [PATCH] fix shellcheck

---
 usr/local/share/bastille/common.sh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh
index 4054ec81..906839b0 100644
--- a/usr/local/share/bastille/common.sh
+++ b/usr/local/share/bastille/common.sh
@@ -301,17 +301,24 @@ set_zfs_mountpoints() {
     # We have to do this if ALTROOT is enabled/present
     local _altroot="$(zpool get -Ho value altroot ${bastille_zfs_zpool})"
 
-    if [ "${_altroot}" != "-" ]; then
-
-        # Set mountpoints to *dir*
-        bastille_prefix_mountpoint="${bastille_prefix}"
-        bastille_backupsdir_mountpoint="${bastille_backupsdir}"
-        bastille_cachedir_mountpoint="${bastille_cachedir}"
-        bastille_jailsdir_mountpoint="${bastille_jailsdir}"
-        bastille_releasesdir_mountpoint="${bastille_releasesdir}"
-        bastille_templatesdir_mountpoint="${bastille_templatesdir}"
-        bastille_logsdir_mountpoint="${bastille_logsdir}"  
+    # Set mountpoints to *bastille*dir*
+    # shellcheck disable=SC2034
+    bastille_prefix_mountpoint="${bastille_prefix}"
+    # shellcheck disable=SC2034
+    bastille_backupsdir_mountpoint="${bastille_backupsdir}"
+    # shellcheck disable=SC2034
+    bastille_cachedir_mountpoint="${bastille_cachedir}"
+    # shellcheck disable=SC2034
+    bastille_jailsdir_mountpoint="${bastille_jailsdir}"
+    # shellcheck disable=SC2034
+    bastille_releasesdir_mountpoint="${bastille_releasesdir}"
+    # shellcheck disable=SC2034
+    bastille_templatesdir_mountpoint="${bastille_templatesdir}"
+    # shellcheck disable=SC2034
+    bastille_logsdir_mountpoint="${bastille_logsdir}"
 
+    # Add _altroot to *dir* if set
+    if [ "${_altroot}" != "-" ]; then  
         # Set *dir* to include ALTROOT
         bastille_prefix="${_altroot}${bastille_prefix}"
         bastille_backupsdir="${_altroot}${bastille_backupsdir}"
@@ -320,7 +327,6 @@ set_zfs_mountpoints() {
         bastille_releasesdir="${_altroot}${bastille_releasesdir}"
         bastille_templatesdir="${_altroot}${bastille_templatesdir}"
         bastille_logsdir="${_altroot}${bastille_logsdir}" 
-
     fi
 }
 set_zfs_mountpoints