From 8f36c080d0b8259026684df1f25ebfcda5e41164 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 27 Mar 2014 10:44:08 -0700
Subject: [PATCH] Streamline the output of the status comment

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/lib.cli | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 759b8eaa1..fc7e8fae8 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -2935,11 +2935,11 @@ show_status() {
     fi
 
     if [ $VERBOSITY -ge 1 ]; then 
-	echo "State:$state"
 	if [ -f $g_firewall ]; then
-	    echo $g_echo_n "$g_firewall was compiled by Shorewall version "
-	    $g_firewall version
+	    state="$state ($g_firewall compiled by Shorewall version $($g_firewall version))"
 	fi
+	echo "State:$state"
+	echo
     fi
 
 }
@@ -2947,7 +2947,6 @@ show_status() {
 status_command() {
     [ $VERBOSITY -ge 1 ] && echo "${g_product}-$SHOREWALL_VERSION Status at $g_hostname - $(date)" && echo
     show_status
-    [ $VERBOSITY -ge 1 ] && echo
     exit $status
 }