From a52dbb4fc6cb6dd013e4016dec2f5d3aba65e763 Mon Sep 17 00:00:00 2001
From: kyodev <kyodev@yandex.fr>
Date: Wed, 13 Dec 2017 06:13:29 +0100
Subject: [PATCH] getThunderbird 1.8.0

---
 scripts/getThunderbird              | 17 +++++++++--------
 scripts/getThunderbird_changelog.md |  3 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/getThunderbird b/scripts/getThunderbird
index 3aeffb0..c30f4ef 100755
--- a/scripts/getThunderbird
+++ b/scripts/getThunderbird
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-version=1.7.0
-date="6/12/2017"
+version=1.8.0
+date="13/12/2017"
 projet="simpledeb"
 contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
 script="getThunderbird"
@@ -199,11 +199,11 @@ f__user(){		# 3/12/2017
 	# si $2=print affiche url testée & entêtes http & location, return 0
 	# si $2=loc affiche seulement location, return 0
 	# si $2=test return 0 si ok, return 1 si KO
-f__wget_test(){		# 5/12/2017
+f__wget_test(){		# 11/12/2017
 	local file_test_wget retourWget retourHttp location
 
 	file_test_wget="/tmp/testWget-$$-$RANDOM"
-	wget -Sq --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
+	wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
 	retourWget="$?"
 	[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
 	[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
@@ -213,8 +213,8 @@ f__wget_test(){		# 5/12/2017
 	[ "$retourWget" == 6 ] && retourWget="6: défaut authentification"
 	[ "$retourWget" == 7 ] && retourWget="7: erreur de protocole"
 	[ "$retourWget" == 8 ] && retourWget="8: réponse serveur en erreur"
-	retourHttp="$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )"
-	location="$( grep -i 'location' $file_test_wget | xargs )"
+	retourHttp=$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )
+	location=$( grep -i 'location' $file_test_wget | xargs )
 	if [ "$2" == "test" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 			# spécial maintenance frama.link, pas de redirection sur page status framalink
@@ -238,8 +238,9 @@ f__wget_test(){		# 5/12/2017
 	fi
 	if [ "$retourWget" != "0" ]; then
 		rm  "$file_test_wget" 2>/dev/null
-#		f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
-		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD"
+		f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
+		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD" # pour les diags
+		return 1
 	fi
 	if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then 
 		echo -e "$GREEN\ntout est ok, réessayer$STD\n"
diff --git a/scripts/getThunderbird_changelog.md b/scripts/getThunderbird_changelog.md
index 587f465..1ac4a4d 100644
--- a/scripts/getThunderbird_changelog.md
+++ b/scripts/getThunderbird_changelog.md
@@ -1,5 +1,8 @@
 # changelog getThunderbird
 
+## getThunderbird 1.8.0 13/12/2017
+
+* révision: f__wget_test
 
 ## getThunderbird 1.7.0 6/12/2017