fix small escape bug, remove a flag from rrdtool that is too new

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@607 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/tools/rrd/makegraphs b/pdns/tools/rrd/makegraphs
index c91e042043afad008d1396b32d0327c4bf779889..62911ca48350cd3ecb9b680050bce8545b67dd4d 100755 (executable)
--- a/pdns/tools/rrd/makegraphs
+++ b/pdns/tools/rrd/makegraphs
@@ -1,5 +1,5 @@
-#!/bin/sh
-WWWPREFIX=/var/www/
+#!/bin/bash
+WWWPREFIX=. 
 WSIZE=800
 HSIZE=250
 
@@ -70,7 +70,7 @@ function makeGraphs()
         LINE2:concurrentqueries#0000ff:"concurrent queries"
         
   rrdtool graph --start -$1 $WWWPREFIX/hitrate-$2.png -w $WSIZE -h $HSIZE -l 0\
-       -v "percentage" -U % \
+       -v "percentage" \
        -t "cache hits" \
        DEF:cachehits=pdns_recursor.rrd:cache-hits:AVERAGE  \
        DEF:cachemisses=pdns_recursor.rrd:cache-misses:AVERAGE  \

diff --git a/pdns/tools/rrd/update b/pdns/tools/rrd/update
index bda2a62ff857cf9e05e669b4e35a62e7d7664fe2..f8203f01338451ddcc602849ce4e45544818d12c 100755 (executable)
--- a/pdns/tools/rrd/update
+++ b/pdns/tools/rrd/update
@@ -8,7 +8,7 @@ VARIABLES="questions cache-entries concurrent-queries\
           outgoing-timeouts nsspeeds-entries negcache-entries all-outqueries throttled-out\
           cache-hits cache-misses answers0-1 answers1-10 answers10-100 answers100-1000 answers-slow"
 
-UVARIABLES=$(echo $VARIABLES | tr [a-z] [A-Z] | tr - _ )
+UVARIABLES=$(echo $VARIABLES | tr '[a-z]' '[A-Z]' | tr - _     )
 
 ./rec_control GET $VARIABLES |
 (