From 2f7eb5a947e5093f91ed5264d3b0a97859e53769 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 16 Apr 2012 21:29:03 +0200
Subject: Use printf(1) instead of 'echo -e' in tools/ scripts.

Closes RADSECPROXY-40.
---
 tools/naptr-eduroam.sh | 7 ++++---
 tools/radsec-dynsrv.sh | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/naptr-eduroam.sh b/tools/naptr-eduroam.sh
index 6497549..0e37afb 100755
--- a/tools/naptr-eduroam.sh
+++ b/tools/naptr-eduroam.sh
@@ -17,12 +17,13 @@ test -n "${1}" || usage
 REALM="${1}"
 DIGCMD=$(command -v dig)
 HOSTCMD=$(command -v host)
+PRINTCMD=$(command -v printf)
 
 dig_it_srv() {
     ${DIGCMD} +short srv $SRV_HOST | sort -n -k1 |
     while read line; do
 	set $line ; PORT=$3 ; HOST=$4
-	echo -e "\thost ${HOST%.}:${PORT}"
+	$PRINTCMD "\thost ${HOST%.}:${PORT}\n"
     done
 }
 
@@ -41,7 +42,7 @@ host_it_srv() {
     ${HOSTCMD} -t srv $SRV_HOST | sort -n -k5 |
     while read line; do
 	set $line ; PORT=$7 ; HOST=$8 
-	echo -e "\thost ${HOST%.}:${PORT}"
+	$PRINTCMD "\thost ${HOST%.}:${PORT}\n"
     done
 }
 
@@ -66,7 +67,7 @@ else
 fi
 
 if [ -n "${SERVERS}" ]; then
-    echo -e "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}"
+    $PRINTCMD "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}\n"
     exit 0
 fi
 
diff --git a/tools/radsec-dynsrv.sh b/tools/radsec-dynsrv.sh
index 3150018..2c87a33 100755
--- a/tools/radsec-dynsrv.sh
+++ b/tools/radsec-dynsrv.sh
@@ -17,12 +17,13 @@ test -n "${1}" || usage
 REALM="${1}"
 DIGCMD=$(command -v digaaa)
 HOSTCMD=$(command -v host)
+PRINTCMD=$(command -v printf)
 
 dig_it() {
    ${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -n -k1 |
    while read line ; do
       set $line ; PORT=$3 ; HOST=$4 
-      echo -e "\thost ${HOST%.}:${PORT}"
+      $PRINTCMD "\thost ${HOST%.}:${PORT}\n"
    done
 }
 
@@ -30,7 +31,7 @@ host_it() {
    ${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -n -k5 |
    while read line ; do
       set $line ; PORT=$7 ; HOST=$8 
-      echo -e "\thost ${HOST%.}:${PORT}"
+      $PRINTCMD "\thost ${HOST%.}:${PORT}\n"
    done
 }
 
@@ -44,7 +45,7 @@ else
 fi
 
 if test -n "${SERVERS}" ; then
-        echo -e "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}"
+        $PRINTCMD "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}\n"
         exit 0
 fi
 
-- 
cgit v1.1