From fb87e16d15b8a6c6a5a16e898ec6483bef2daccc Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Tue, 8 Jun 2021 00:28:25 -0400
Subject: [PATCH] Update release list, fix bug in tarballs page

---
 CHANGELOG                         | 1 +
 bastille-init                     | 2 +-
 gui/bastille_manager_tarballs.php | 6 ++++--
 version                           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2df7909..f6b279c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.90......Update release list, fix bug in tarballs page.
 1.0.89......Fix small grep/regex error.
 1.0.88......Fix for properly copy host resolv.conf to jails.
 1.0.87......Cosmetic changes, update help output.
diff --git a/bastille-init b/bastille-init
index 683b101..cc1b6ee 100755
--- a/bastille-init
+++ b/bastille-init
@@ -66,7 +66,7 @@ EXTCONFLINK="/var/etc/${APPNAME}_conf"
 BASTILLERCD="/usr/local/etc/rc.d/${APPNAME}"
 BASTILLEPATH="${USRLOCAL}/bin"
 BASTILLECONF="${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf"
-BASTILLECONFFILE="/conf/bastille_conf"
+BASTILLECONFFILE="/conf/bastille_config"
 BASTILLECONFLINK="/var/etc/bastille_conf"
 BASTILLECONF_EXT="${CWDIR}/conf/bastille.conf.ext"
 INCLUDE_PATH="${CWDIR}/conf/system"
diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php
index 96e2a38..a812cc3 100644
--- a/gui/bastille_manager_tarballs.php
+++ b/gui/bastille_manager_tarballs.php
@@ -119,9 +119,9 @@ if($_POST):
 					$ausgabe = preg_replace('/\e[[][A-Za-z0-9];?[0-9]*m?/', '', $ausgabe);
 					ob_end_clean();
 					$savemsg .= str_replace("\n", "<br />", $ausgabe)."<br />";
-					exec("/usr/sbin/sysrc -f {$configfile} ZFS_ACTIVATED=\"YES\"");
+					// Set back default distfiles.
+					exec("/usr/sbin/sysrc -f {$config_path} bastille_bootstrap_archives=\"$default_distfiles\"");
 				else:
-					//$input_errors[] = gtext('An error has occurred ??????.');
 					$errormsg .= sprintf(gtext('%s Failed to download and/or extract release base.'),$get_release);
 				endif;
 			endif;
@@ -233,9 +233,11 @@ $document->render();
 		<tbody>
 <?php
 			$a_action = [
+				'13.0-RELEASE' => gettext('13.0-RELEASE'),
 				'12.2-RELEASE' => gettext('12.2-RELEASE'),
 				'12.1-RELEASE' => gettext('12.1-RELEASE'),
 				'12.0-RELEASE' => gettext('12.0-RELEASE'),
+				'11.4-RELEASE' => gettext('11.4-RELEASE'),
 				'11.3-RELEASE' => gettext('11.3-RELEASE'),
 				'11.2-RELEASE' => gettext('11.2-RELEASE'),
 			];
diff --git a/version b/version
index 9d25b39..ac2282a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.89
+1.0.90