drop args, use vars like other scripts do, default to assuming they are on PATH

diff --git a/modules/tinydnsbackend/generate-data.sh b/modules/tinydnsbackend/generate-data.sh
index eaf08e38fa58119ef4b1dbc9faa2e6761e2e16a2..d201e90446d0380abeee3e34edd5090290f03047 100755 (executable)
--- a/modules/tinydnsbackend/generate-data.sh
+++ b/modules/tinydnsbackend/generate-data.sh
@@ -2,21 +2,9 @@
 set -exu
 
 startdir=`pwd`
-tcpclient=/usr/bin/tcpclient
-axfrget=$1
-tinydnsdata=$2
-
-[ -z "$axfrget" ] && axfrget=/service/tinydns/bin/axfr-get
-[ -z "$tinydnsdata" ] && tinydnsdata=/service/tinydns/bin/tinydns-data
-
-
-
-if [ ! -x $axfrget ] || [ "$axfrget" = help ] || [ ! -x $tinydnsdata ] || [ "$tinydnsdata" = help ]
-then
-  echo "Usage: ./generate-data.sh <axfr-get location> <tinydns-data location>";
-  exit 1
-fi
-
+TCPCLIENT=${TCPCLIENT:-tcpclient}
+AXFRGET=${AXFRGET:-axfr-get}
+TINYDNSDATA=${TINYDNSDATA:-tinydns-data}
 
 # Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well)
 for zone in $(grep 'zone ' ../../regression-tests/named.conf | cut -f2 -d\")
@@ -45,11 +33,11 @@ cd $startdir
 
 for zone in $(grep 'zone ' ../../regression-tests/named.conf | cut -f2 -d\")
 do
-  $tcpclient 127.0.0.1 5300 $axfrget $zone $zone.out $zone.out.tmp
+  $TCPCLIENT 127.0.0.1 5300 $AXFRGET $zone $zone.out $zone.out.tmp
   cat $zone.out >> data
   rm $zone.out
 done
 
-$tinydnsdata  
+$TINYDNSDATA
 
 kill $(cat ../../regression-tests/pdns.pid)