From f7aa05c490d2027225e99a6d5f5bf920e76bf5ed Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 9 Mar 2019 11:56:13 +0000 Subject: [PATCH] bashism --- src/gns/test_gns_delegated_lookup.sh | 6 +++--- src/gns/test_gns_dht_lookup.sh | 6 +++--- src/gns/test_gns_gns2dns_cname_lookup.sh | 10 +++++----- src/gns/test_gns_zkey_lookup.sh | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index 21774ad8d..af9994b34 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh # This file is in the public domain. trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" +which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" LOCATION=$(which gnunet-config) if [ -z $LOCATION ] @@ -35,7 +35,7 @@ gnunet-arm -e -c test_gns_lookup.conf rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` -if [ "$RES_IP" == "$TEST_IP" ] +if [ "$RES_IP" = "$TEST_IP" ] then exit 0 else diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh index 07e559752..ac90d58a8 100755 --- a/src/gns/test_gns_dht_lookup.sh +++ b/src/gns/test_gns_dht_lookup.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh # This file is in the public domain. trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" +which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" LOCATION=$(which gnunet-config) if [ -z $LOCATION ] @@ -55,7 +55,7 @@ then echo "Failed to resolve to proper IP, got $RES_IP_REL. (relative expiration)" #exit 1 fi -if [ "$RES_IP" == "$TEST_IP" ] +if [ "$RES_IP" = "$TEST_IP" ] then exit 0 else diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh b/src/gns/test_gns_gns2dns_cname_lookup.sh index c07905d83..fbc1dd7ee 100755 --- a/src/gns/test_gns_gns2dns_cname_lookup.sh +++ b/src/gns/test_gns_gns2dns_cname_lookup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This file is in the public domain. trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT @@ -25,7 +25,7 @@ TEST_RECORD_NAME="homepage" XNS=ns.joker.com -if ! nslookup gnunet.org a.$XNS &> /dev/null +if ! nslookup gnunet.org a.$XNS > /dev/null 2>&1 then echo "Cannot reach DNS, skipping test" exit 77 @@ -43,7 +43,7 @@ MY_EGO="myego" # various names we will use for resolution TEST_DOMAIN="www.${TEST_RECORD_NAME}.$MY_EGO" -which timeout &> /dev/null && DO_TIMEOUT="timeout 15" +which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 15" gnunet-arm -s -c test_gns_lookup.conf OUT=`$DO_TIMEOUT gnunet-resolver -c test_gns_lookup.conf gnunet.org` @@ -77,7 +77,7 @@ gnunet-arm -e -c test_gns_lookup.conf rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` ret=0 -if [ "$RES_IP" == "$TEST_IP" ] +if [ "$RES_IP" = "$TEST_IP" ] then echo "PASS: Resolved $TEST_DOMAIN to $RES_IP." else @@ -85,7 +85,7 @@ else ret=1 fi -if [ "$RES_IP6" == "$TEST_IP6" ] +if [ "$RES_IP6" = "$TEST_IP6" ] then echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6." else diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh index b36a16fa2..03118d741 100755 --- a/src/gns/test_gns_zkey_lookup.sh +++ b/src/gns/test_gns_zkey_lookup.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh # This file is in the public domain. trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT -which timeout &> /dev/null && DO_TIMEOUT="timeout 5" +which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5" LOCATION=$(which gnunet-config) if [ -z $LOCATION ] @@ -30,7 +30,7 @@ gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gn gnunet-arm -e -c test_gns_lookup.conf rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` -if [ "$RES_IP" == "$TEST_IP" ] +if [ "$RES_IP" = "$TEST_IP" ] then exit 0 else -- 2.25.1