From 4373b8b8d9e123e18a52872e3c06f27736f56104 Mon Sep 17 00:00:00 2001
From: Bike Dude <admin@hackacad.net>
Date: Wed, 10 Feb 2021 15:07:53 +0100
Subject: [PATCH] lint

---
 usr/local/share/bastille/bootstrap.sh | 10 +++++-----
 usr/local/share/bastille/console.sh   |  4 ++--
 usr/local/share/bastille/create.sh    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index 226cc2ae..2c5c526f 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -448,7 +448,7 @@ ubuntu_bionic|bionic|ubuntu-bionic)
         esac
     fi
     if which -s debootstrap; then
-        debootstrap --foreign --arch=amd64 --no-check-gpg bionic ${bastille_releasesdir}/Ubuntu_1804
+        debootstrap --foreign --arch=amd64 --no-check-gpg bionic "${bastille_releasesdir}"/Ubuntu_1804
     else
         warn "Debootstrap not found. Should it be installed? (N|y)"
         read  answer
@@ -458,11 +458,11 @@ ubuntu_bionic|bionic|ubuntu-bionic)
                 ;;
             yes|Yes|y|Y)
                 pkg install debootstrap -y
-                debootstrap --foreign --arch=amd64 --no-check-gpg bionic ${bastille_releasesdir}/Ubuntu_1804
+                debootstrap --foreign --arch=amd64 --no-check-gpg bionic "${bastille_releasesdir}"/Ubuntu_1804
                 ;;
         esac
     fi
-    echo "APT::Cache-Start 251658240;" > ${bastille_releasesdir}/Ubuntu_1804/etc/apt/apt.conf.d/00aptitude
+    echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/Ubuntu_1804/etc/apt/apt.conf.d/00aptitude
     ;;
 ubuntu_focal|focal|ubuntu-focal)
     #check and install OS dependencies @hackacad
@@ -486,7 +486,7 @@ ubuntu_focal|focal|ubuntu-focal)
         esac
     fi
     if which -s debootstrap; then
-        debootstrap --foreign --arch=amd64 --no-check-gpg focal ${bastille_releasesdir}/Ubuntu_2004
+        debootstrap --foreign --arch=amd64 --no-check-gpg focal "${bastille_releasesdir}"/Ubuntu_2004
     else
         warn "Debootstrap not found. Should it be installed? (N|y)"
         read  answer
@@ -496,7 +496,7 @@ ubuntu_focal|focal|ubuntu-focal)
                 ;;
             yes|Yes|y|Y)
                 pkg install debootstrap -y
-                debootstrap --foreign --arch=amd64 --no-check-gpg focal ${bastille_releasesdir}/Ubuntu_2004
+                debootstrap --foreign --arch=amd64 --no-check-gpg focal "${bastille_releasesdir}"/Ubuntu_2004
                 ;;
         esac
     fi
diff --git a/usr/local/share/bastille/console.sh b/usr/local/share/bastille/console.sh
index 046a2262..b5150388 100644
--- a/usr/local/share/bastille/console.sh
+++ b/usr/local/share/bastille/console.sh
@@ -76,11 +76,11 @@ check_fib() {
 
 for _jail in ${JAILS}; do
     info "[${_jail}]:"
-    LOGIN="$(jexec -l "${_jail}" which login)" #needs to be added for validate_user as well @hackacad
+    LOGIN="$(jexec -l "${_jail}" which login)"
     if [ -n "${USER}" ]; then
         validate_user
     else
-        LOGIN="$(jexec -l "${_jail}" which login)" #needs to be added for validate_user as well @hackacad
+        LOGIN="$(jexec -l "${_jail}" which login)"
         ${_setfib} jexec -l "${_jail}" $LOGIN -f root
     fi
     echo
diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index 48c615b7..66db1150 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -425,7 +425,7 @@ create_jail() {
 
     # Jail must be started before applying the default template. -- cwells
     if [ -z "${EMPTY_JAIL}" ]; then
-            bastille start "${NAME}"
+        bastille start "${NAME}"
     elif [ -n "${EMPTY_JAIL}" ]; then
         # Don't start empty jails unless a template defined.
         if [ -n "${bastille_template_empty}" ]; then