Cleanup console package installation text. Now it looks nice and tidy.

2 files changed, 6 insertions, 2 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 1b18ff1..aead5d5 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -844,7 +844,7 @@ function update_output_window($text) {
 	global $pkg_interface;
 	$log = ereg_replace("\n", "\\n", $text);
 	if($pkg_interface == "console") {
-		echo " $log\n";
+		/* too chatty */
 	} else {
 		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>";
 	}
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index c78bd9a..4d48e3b 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -385,7 +385,9 @@ function read_body($ch, $string) {
 }
 
 function install_package($package, $pkg_info = "") {
-	global $g, $config, $pkg_interface, $fd_log, $static_output;
+	global $g, $config, $pkg_interface, $fd_log, $static_output, $pkg_interface;
+	if($pkg_interface == "console") 	
+		echo "\n";
 	/* open logfiles and begin installation */
 	if(!$fd_log) {
 		if(!$fd_log = fopen("{$g['tmp_path']}/pkg_mgr_{$package}.log", "w")) {
@@ -499,6 +501,8 @@ function install_package_xml($pkg) {
 
 	/* pkg_add the package and its dependencies */
 	if($pkg_info['depends_on_package_base_url'] != "") {
+		if($pkg_interface == "console") 
+			echo "\n";
 		update_status("Installing " . $pkg_info['name'] . " and its dependencies.");
 		$static_output .= "Downloading " . $pkg_info['name'] . " and its dependencies... ";
 		$static_orig = $static_output;