From 69ff1271f5b0ccdb9d8c0526a27ba393869c5ac8 Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Tue, 12 May 2020 13:16:26 -0400
Subject: [PATCH] Display bastille bootstrap output after base release fetch

---
 CHANGELOG                         |  1 +
 gui/bastille_manager_tarballs.php | 33 +++++++++++++++++++------------
 version                           |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 036315d..551120d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.57......Display bastille bootstrap output after base release fetch.
 1.0.56......Add extra confirmation before extension removal.
 1.0.55......Add backup path config check.
 1.0.54......Don't skip ZFS activation if "Available but not enabled" status displayed.
diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php
index 9e333ed..2019aa8 100644
--- a/gui/bastille_manager_tarballs.php
+++ b/gui/bastille_manager_tarballs.php
@@ -71,6 +71,7 @@ $sphere_array = $rel_list;
 
 if($_POST):
 	unset($input_errors);
+	unset($errormsg);
 	unset($savemsg);
 	$pconfig = $_POST;
 	if(isset($_POST['Cancel']) && $_POST['Cancel']):
@@ -81,7 +82,7 @@ if($_POST):
 	if (isset($_POST['Download']) && $_POST['Download']):
 		$get_release = $pconfig['release_item'];
 		$check_release = ("{$rootfolder}/releases/{$get_release}");
-		$cmd = ("/usr/local/bin/bastille bootstrap {$get_release}");
+		$cmd = sprintf('/usr/local/bin/bastille bootstrap %1$s > %2$s',$get_release,$logevent);
 		$base_mandatory = "base";
 
 		unset($lib32,$ports,$src);
@@ -96,29 +97,35 @@ if($_POST):
 		endif;
 		$opt_tarballs = "$lib32 $ports $src";
 
-		if(file_exists($check_release)):
-			// FreeBSD base release check.
-			$savemsg .= sprintf(gtext('%s base appears to be already extracted.'),$get_release);
-		else:
+		// FreeBSD base release check.
+		//if(file_exists($check_release)):
+		//	$savemsg .= sprintf(gtext('%s base appears to be already extracted.'),$get_release);
+		//else:
 			// Download a FreeBSD base release.
 			if ($_POST['Download']):
 				if ($opt_tarballs):
 					if ($config_path):
-						// Override default distfiles.
+						// Override default distfiles once.
 						exec("/usr/sbin/sysrc -f {$config_path} bastille_bootstrap_archives=\"$base_mandatory $opt_tarballs\"");
 					endif;
 				endif;
-				unset($output,$retval);mwexec2($cmd,$output,$retval);
-				if($retval == 0):
-					//$savemsg .= sprintf(gtext('%s base downloaded and extracted successfully.'),$get_release);
-					// Set back default distfiles.
-					exec("/usr/sbin/sysrc -f {$config_path} bastille_bootstrap_archives=\"$default_distfiles\"");
-					header('Location: bastille_manager_tarballs.php');
+				$return_val = 0;
+				$output = [];
+				exec($cmd,$output,$return_val);
+				if($return_val == 0):
+					ob_start();
+					include("{$logevent}");
+					$ausgabe = ob_get_contents();
+					$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\"");
 				else:
+					//$input_errors[] = gtext('An error has occurred ??????.');
 					$errormsg .= sprintf(gtext('%s Failed to download and/or extract release base.'),$get_release);
 				endif;
 			endif;
-		endif;
+		//endif;
 	endif;
 
 	if (isset($_POST['Destroy']) && $_POST['Destroy']):
diff --git a/version b/version
index ed453e6..9f1a864 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.56
+1.0.57