From 997e2c05ef9ba4b3b949b3b0b1f665a33521344b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 20 Jul 2007 11:36:10 +0000
Subject: Use /bin/echo to avoid echo -e bashism.

---
 ipmasq/rules/A01precompute.rul       | 6 +++---
 ipmasq/rules/A01precompute_ipsec.def | 2 +-
 ipmasq/rules/A80precompute_pfw.def   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ipmasq/rules/A01precompute.rul b/ipmasq/rules/A01precompute.rul
index 45786e6..b1bc4ce 100644
--- a/ipmasq/rules/A01precompute.rul
+++ b/ipmasq/rules/A01precompute.rul
@@ -15,7 +15,7 @@ if [ -n "$EXTERNAL" -o -n "$INTERNAL" -o -n "$IPSEC" ]; then
         eval "PEEROFIF_$ii=$peer"
 	eval "BCOFIF_$ii=$bc"
         if [ "$SHOWRULES" = "yes" ]; then
-            echo -e "  $i\t$ip/$nm"
+            /bin/echo -e "  $i\t$ip/$nm"
         fi
     done
 fi
@@ -45,11 +45,11 @@ if [ -n "$IPSEC" ]; then
 	IPSECCONN="$IPSECCONN $conncollect"
 	eval "IPSECCONN_${ii}=\"$conncollect\""
         if [ "$SHOWRULES" = "yes" ]; then
-            echo -e "  $i\t$ip/$nm"
+            /bin/echo -e "  $i\t$ip/$nm"
 	    for conn in $conncollect; do
 		eval "IPSEC_HERE=\$IPSEC_HERE_$conn"
 		eval "IPSEC_THERE=\$IPSEC_THERE_$conn"
-		echo -e "    $IPSEC_HERE -> $IPSEC_THERE"
+		/bin/echo -e "    $IPSEC_HERE -> $IPSEC_THERE"
 	    done
         fi
     done
diff --git a/ipmasq/rules/A01precompute_ipsec.def b/ipmasq/rules/A01precompute_ipsec.def
index 197c2d4..5d90913 100644
--- a/ipmasq/rules/A01precompute_ipsec.def
+++ b/ipmasq/rules/A01precompute_ipsec.def
@@ -20,7 +20,7 @@ if [ -n "$IPSEC" ]; then
 	done
 	eval "CIDROFIPSEC_${ii}=\"$cidrcollect\""
         if [ "$SHOWRULES" = "yes" ]; then
-            echo -e "#:   $i\t$ip/$nm\t$cidrcollect"
+            /bin/echo -e "#:   $i\t$ip/$nm\t$cidrcollect"
         fi
     done
 fi
diff --git a/ipmasq/rules/A80precompute_pfw.def b/ipmasq/rules/A80precompute_pfw.def
index 491da60..ba8aaec 100644
--- a/ipmasq/rules/A80precompute_pfw.def
+++ b/ipmasq/rules/A80precompute_pfw.def
@@ -49,7 +49,7 @@ if [ -n "$PFW" ]; then
 	    eval "PFWIP_$pool=\"$ip\""
 	    eval "PFWPORT_$pool=\"$destport\""
 	    if [ "$SHOWRULES" = "yes" ]; then
-        	echo -e "#:   $protos_bulk \t$origports_bulk \t->\t $ip $destport \t($pool->$i)"
+        	/bin/echo -e "#:   $protos_bulk \t$origports_bulk \t->\t $ip $destport \t($pool->$i)"
 	    fi
 	done
     done
-- 
cgit v1.2.3