From patchwork Sun Jan 27 14:47:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: wget: Remove -t from calls From: Adrian Schmutzler X-Patchwork-Id: 982 Message-Id: <20190127144707.21756-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 27 Jan 2019 15:47:07 +0100 The wget from busybox we are using ignores the -t option, although it does not throw errors in the currently used version. However, specifying the -t option in calls where it is not used is misleading, so it should be removed. Signed-off-by: Adrian Schmutzler Reviewed-by: Christian Dresel --- .../fff/fff-hoods/files/usr/lib/functions/fff/hoodfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile b/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile index 89af84c8..d4a9ecb2 100644 --- a/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile +++ b/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile @@ -44,9 +44,9 @@ getWirelessHoodfile() { # wait a moment to start the interface sleep 10; - if wget -T15 -t5 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then + if wget -T15 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then return 0 - elif wget -T15 -t5 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then + elif wget -T15 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then return 0 else return 1 @@ -70,7 +70,7 @@ getEthernetHoodfile() { neighbor_addrs=$(ping6 -c2 ff02::1%"${ethmesh_dev}" | grep seq | grep DUP | cut -d " " -f4 | sed s/:$//g | sort -u) for addr in $neighbor_addrs; do - wget -T2 -t1 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0 + wget -T2 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0 done # got no hoodfile @@ -86,7 +86,7 @@ getGatewayHoodfile() { echo "Trying to get hoodfile from gateway..." - if wget -T15 -t5 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then + if wget -T15 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then return 0 else return 1 @@ -108,7 +108,7 @@ getKeyserverHoodfile() { echo "Getting hoodfile from Keyserver" - if wget -T15 -t5 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then + if wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then return 0 else return 1