From e40be793bab7d9b1659a04a9960b60aec7817eb5 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 28 Oct 2010 11:24:52 -0700 Subject: [PATCH] Insure that VERBOSITY=0 when interrogating compiled script version Signed-off-by: Tom Eastep --- Shorewall/lib.common | 6 ++++++ Shorewall6/lib.common | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Shorewall/lib.common b/Shorewall/lib.common index 0fa629282..0ef5c96d5 100644 --- a/Shorewall/lib.common +++ b/Shorewall/lib.common @@ -34,6 +34,10 @@ get_script_version() { # $1 = script local version local ifs local digits + local verbosity + + verbosity="$VERBOSITY" + VERBOSITY=0 temp=$( $SHOREWALL_SHELL $1 version | sed 's/-.*//' ) @@ -54,6 +58,8 @@ get_script_version() { # $1 = script fi echo $version + + VERBOSITY="$verbosity" } # diff --git a/Shorewall6/lib.common b/Shorewall6/lib.common index e826f24d0..ca8e8ee33 100644 --- a/Shorewall6/lib.common +++ b/Shorewall6/lib.common @@ -32,6 +32,10 @@ get_script_version() { # $1 = script local version local ifs local digits + local verbosity + + verbosity="$VERBOSITY" + VERBOSITY=0 temp=$( $SHOREWALL_SHELL $1 version | sed 's/-.*//' ) @@ -52,6 +56,8 @@ get_script_version() { # $1 = script fi echo $version + + VERBOSITY="$verbosity" } #