changed echo statements to printf;

changed legacy rrd paths to /tmp/rrd and script dir to ~/srcz;

2 files changed, 8 insertions, 8 deletions

diff --git a/cisco678polld.sh b/cisco678polld.sh
index b017601..180e016 100644
--- a/cisco678polld.sh
+++ b/cisco678polld.sh
@@ -53,7 +53,7 @@ ckmkdb() {
     fi
 
     if [ ! -f ${DBDIR}/${PPPDBFILE} ] ; then
-        echo ${DBDIR}/${PPPDBFILE} does not exist!
+        printf "${DBDIR}/${PPPDBFILE} does not exist!\n"
         RRDARGZ=("")
         RRDARGZ=(
             "${RRDARGZ[@]:0}" \
@@ -192,7 +192,7 @@ main() {
     ## file names
     LOCKFILE="/tmp/rrd/${SCRIPTNAME}.lock"
     LOGFILE="/tmp/rrd/${SCRIPTNAME}.log"
-    DBDIR="/tmp/rrd"
+    DBDIR="/tmp/rrd/db"
     GRAPHDIR="/tmp/rrd/cisco678"
     RRDSTEP=15
     WAIT=5
diff --git a/start-cisco678polld.sh b/start-cisco678polld.sh
index fb82ef0..c26ced4 100755..100644
--- a/start-cisco678polld.sh
+++ b/start-cisco678polld.sh
@@ -9,7 +9,7 @@
 #set -x
 
 DAEMON=cisco678polld.sh
-DPATH=~/mon_rrd
+DPATH=~/srcz/mon_rrd
 DLOCK=/var/tmp/${DAEMON}.lock
 
 
@@ -19,10 +19,10 @@ cklock() {
         if [ -r ${1} ] ; then
             DPID=$( cat ${1} )
         else
-            echo lock is not readable
+            printf "lock is not readable\n"
         fi
     else
-        echo lock does not exist
+        printf "lock does not exist\n"
     fi
 }
 
@@ -35,10 +35,10 @@ cklockpid() {
             grep -v 'grep' |\
             awk '{print $1}' )
         if [ ${CKPID} ] && [ ${1} -eq ${CKPID} ] ; then
-            echo proc is running, lock is valid
+            printf "proc is running, lock is valid"
         fi
     else
-        echo lock pid does not exist 
+        pritf lock pid does not exist\n"
     fi
 }
 
@@ -108,7 +108,7 @@ case "${1}" in
         start_daemon
     ;;
     *)
-        echo "Usage: $0 {start|stop|terminate|exterminate|restart}"
+        printf "Usage: $0 {start|stop|terminate|exterminate|restart}\n"
     ;;
 esac