13 files changed, 18 insertions, 18 deletions

diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh
index 14e14c570..d1c838d99 100755
--- a/src/gns/test_gns_cname_lookup.sh
+++ b/src/gns/test_gns_cname_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 TEST_DOMAIN_PLUS="www.gnu"
 TEST_DOMAIN_DNS="www3.gnu"
 TEST_IP_PLUS="127.0.0.1"
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh
index 7881c1e1b..ca50510ee 100755
--- a/src/gns/test_gns_delegated_lookup.sh
+++ b/src/gns/test_gns_delegated_lookup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
-rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh
index 878ca2f85..d5e51ffe2 100755
--- a/src/gns/test_gns_ipv6_lookup.sh
+++ b/src/gns/test_gns_ipv6_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 TEST_IP="dead::beef"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh
index 499109fc5..ddaa1c47b 100755
--- a/src/gns/test_gns_lookup.sh
+++ b/src/gns/test_gns_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh
index 563f750c2..41453cd0d 100755
--- a/src/gns/test_gns_mx_lookup.sh
+++ b/src/gns/test_gns_mx_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 
 TEST_MX="5,mail.gnu"
diff --git a/src/gns/test_gns_ns_lookup.sh b/src/gns/test_gns_ns_lookup.sh
index 827156974..018bcb9c2 100755
--- a/src/gns/test_gns_ns_lookup.sh
+++ b/src/gns/test_gns_ns_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 TEST_DOMAIN="www.homepage.gnu"
 TEST_DOMAIN_ALT="homepage.gnu"
 TEST_DOMAIN_ALT2="uk.homepage.gnu"
diff --git a/src/gns/test_gns_plus_lookup.sh b/src/gns/test_gns_plus_lookup.sh
index 1e0581fe1..d7138c62b 100755
--- a/src/gns/test_gns_plus_lookup.sh
+++ b/src/gns/test_gns_plus_lookup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
-rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/gns/test_gns_pseu_shorten.sh b/src/gns/test_gns_pseu_shorten.sh
index 40a9aa054..b1eac5570 100755
--- a/src/gns/test_gns_pseu_shorten.sh
+++ b/src/gns/test_gns_pseu_shorten.sh
@@ -2,7 +2,7 @@
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 
-rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 TEST_IP="127.0.0.1"
 TEST_PSEU="alice"
 TEST_NAME="www.mybestfriendalice.gnu"
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh
index ac8bc7e45..1298c324b 100755
--- a/src/gns/test_gns_txt_lookup.sh
+++ b/src/gns/test_gns_txt_lookup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 TEST_TXT="GNS powered txt record data"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh
index 1a3de520b..56c2ad09d 100755
--- a/src/gns/test_gns_zkey_lookup.sh
+++ b/src/gns/test_gns_zkey_lookup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
-rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME`
 
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
diff --git a/src/namestore/test_namestore_delete.sh b/src/namestore/test_namestore_delete.sh
index 7e5ca97e7..817697670 100755
--- a/src/namestore/test_namestore_delete.sh
+++ b/src/namestore/test_namestore_delete.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 CONFIGURATION="test_namestore_api.conf"
 trap "gnunet-arm -e -c $CONFIGURATION" SIGINT
-rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o GNUNET_HOME`
 TEST_DOMAIN_PLUS="www.gnu"
 TEST_DOMAIN_DNS="www3.gnu"
 TEST_IP_PLUS="127.0.0.1"
@@ -17,7 +17,7 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 function start_peer
 {
         gnunet-arm -s -c $CONFIGURATION
-        gnunet-identity -C testego -c $CONFIGURATION    
+        gnunet-identity -C testego -c $CONFIGURATION
 }
 
 function stop_peer
@@ -43,7 +43,7 @@ for LINE in $OUTPUT ;
         fi
         if echo "$LINE" | grep -q "$TEST_IP_PLUS"; then
                 FOUND_IP=true;
-        fi      
+        fi
  done
 stop_peer
 
diff --git a/src/namestore/test_namestore_lookup.sh b/src/namestore/test_namestore_lookup.sh
index 681af7d96..c080fa961 100755
--- a/src/namestore/test_namestore_lookup.sh
+++ b/src/namestore/test_namestore_lookup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 CONFIGURATION="test_namestore_api.conf"
 trap "gnunet-arm -e -c $CONFIGURATION" SIGINT
-rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o GNUNET_HOME`
 TEST_IP_PLUS="127.0.0.1"
 TEST_RECORD_NAME_DNS="www3"
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
@@ -9,7 +9,7 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 function start_peer
 {
         gnunet-arm -s -c $CONFIGURATION
-        gnunet-identity -C testego -c $CONFIGURATION    
+        gnunet-identity -C testego -c $CONFIGURATION
 }
 
 function stop_peer
@@ -38,7 +38,7 @@ for LINE in $OUTPUT ;
         if echo "$LINE" | grep -q "$TEST_IP_PLUS"; then
                 FOUND_IP=true;
                 #echo $FOUND_IP
-        fi      
+        fi
  done
 stop_peer
 
diff --git a/src/namestore/test_namestore_put.sh b/src/namestore/test_namestore_put.sh
index fdf01ada4..f5204dc35 100755
--- a/src/namestore/test_namestore_put.sh
+++ b/src/namestore/test_namestore_put.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 CONFIGURATION="test_namestore_api.conf"
 trap "gnunet-arm -e -c $CONFIGURATION" SIGINT
-rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o SERVICEHOME`
+rm -rf `gnunet-config -c $CONFIGURATION -s PATHS -o GNUNET_HOME`
 TEST_DOMAIN_PLUS="www.gnu"
 TEST_DOMAIN_DNS="www3.gnu"
 TEST_IP_PLUS="127.0.0.1"
@@ -17,7 +17,7 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 function start_peer
 {
         gnunet-arm -s -c $CONFIGURATION
-        gnunet-identity -C testego -c $CONFIGURATION    
+        gnunet-identity -C testego -c $CONFIGURATION
 }
 
 function stop_peer