From 6f0e33fe9b5feb87dbf09c9f294bf06bd4992274 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Tue, 2 Dec 2025 15:24:20 -0500
Subject: [PATCH 1/2] upgrade: use pkgbase if jail is pkgbasified

---
 usr/local/share/bastille/upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/share/bastille/upgrade.sh b/usr/local/share/bastille/upgrade.sh
index 84e331c2..639ab4a6 100644
--- a/usr/local/share/bastille/upgrade.sh
+++ b/usr/local/share/bastille/upgrade.sh
@@ -122,7 +122,7 @@ thick_jail_check() {
         else
             FREEBSD_BRANCH="release"
         fi
-        if [ "${NEW_MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
+        if pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
             PKGBASE=1
         fi
 
@@ -438,4 +438,4 @@ case ${NEW_RELEASE} in
             fi
         fi
         ;;
-esac
\ No newline at end of file
+esac

From b0f90c2ffc2b2482b68eced4aa71cfd4de0a1636 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Tue, 2 Dec 2025 15:25:18 -0500
Subject: [PATCH 2/2] update: better pkgbase check

---
 usr/local/share/bastille/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/local/share/bastille/update.sh b/usr/local/share/bastille/update.sh
index 7ff12adc..863fcf0a 100644
--- a/usr/local/share/bastille/update.sh
+++ b/usr/local/share/bastille/update.sh
@@ -139,7 +139,7 @@ jail_check() {
         else
             FREEBSD_BRANCH="release"
         fi
-        if [ "${MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
+        if pkg -r "${bastille_jailsdir}/${TARGET}/root" which /usr/bin/uname > /dev/null 2>&1; then
             PKGBASE=1
         fi
     fi
@@ -276,7 +276,7 @@ release_check() {
         else
             FREEBSD_BRANCH="release"
         fi
-        if [ "${MAJOR_VERSION}" -ge 16 ] || pkg -r "${bastille_releasesdir}/${TARGET}" which /usr/bin/uname > /dev/null 2>&1; then
+        if pkg -r "${bastille_releasesdir}/${TARGET}" which /usr/bin/uname > /dev/null 2>&1; then
             PKGBASE=1
         fi
     fi
@@ -489,4 +489,4 @@ case ${UPDATE_TARGET} in
     *)
         error_exit "[ERROR]: Unknown update target."
         ;;
-esac
\ No newline at end of file
+esac