From b5aa39d7e87775c473d5f944d205f54e6f1878c9 Mon Sep 17 00:00:00 2001
From: kyodev <kyodev@yandex.fr>
Date: Tue, 18 Jul 2017 17:14:33 +0200
Subject: [PATCH] 0.4.1 fix bug

---
 scripts/getFirefox | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/scripts/getFirefox b/scripts/getFirefox
index 7d649ac..6aeed8e 100755
--- a/scripts/getFirefox
+++ b/scripts/getFirefox
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=0.4.0
+version=0.4.1
 date="18/07/2017"
 projet="Kyodev"
 contact="https://framagit.org/kyodev/kyopages/issues"
@@ -207,22 +207,6 @@ rm "/home/$user_/.mozilla/$script.anacrontab"
 esac
 }
 
-	# version Firefox en ligne,  $verLatest, $verEsr, $versionInstall, $user_agent, $urlOnline, si $1="quiet", pas d'affichage
-ffx_versionFF(){
-	urlOnline="https://www.mozilla.org/en-US/firefox/notes/"
-	verLatest=$(wget --no-check-certificate --tries=1 --timeout=15 --user-agent=$user_agent -nv -qO - $urlOnline | \
-			grep -Eo 'data-latest-firefox="[0-9\.]+"' | grep -Eo '[0-9\.]+')
-	verEsr=$(wget --no-check-certificate --tries=1 --timeout=15 --user-agent=$user_agent -nv -qO - $urlOnline | \
-			grep -Eo 'data-esr-versions="[0-9 \.]+"' | grep -Eo ' [0-9\.]+' | grep -Eo '[0-9\.]+') 
-	versionInstall=""
-	if [ -x /opt/firefox-latest/firefox ];  then versionInstall+="\n     Release: $(/opt/firefox-latest/firefox -v | grep -Eo '[0-9].*')"; fi
-	if [ -x /opt/firefox-esr/firefox ];     then versionInstall+="\n     ESR:     $(/opt/firefox-esr/firefox -v | grep -Eo '[0-9].*')"; fi
-	if [ -x /opt/firefox-aurora/firefox ];  then versionInstall+="\n     Aurora:  $(/opt/firefox-aurora/firefox -v | grep -Eo '[0-9].*')"; fi
-	if [ -x /opt/firefox-nightly/firefox ]; then versionInstall+="\n     Nightly: $(/opt/firefox-nightly/firefox -v | grep -Eo '[0-9].*')"; fi
-	if [ "$versionInstall" != "" ] && [ "$1" != "quiet" ]; then f__info "Firefox installé(s): $versionInstall"; fi
-	if [ "$1" != "quiet" ]; then f__info "Version Firefox en ligne:\n     Release: $verLatest\n     ESR:     $verEsr"; fi
-}
-
 	# ascii art godzilla
 ffx_godzilla(){
 printf "$RED"
@@ -310,11 +294,26 @@ StartupNotify=true
 EOF
 }
 
-	# install firefox
+	# version Firefox en ligne,  $verLatest, $verEsr, $versionInstall, $urlOnline, si $1="quiet", pas d'affichage version en ligne
+ffx_versionFF(){
+	urlOnline="https://www.mozilla.org/en-US/firefox/notes/"
+data-latest-firefox="54.0.1" data-esr-versions="52.2.1"
+	verLatest="$(wget -q --tries=2 --timeout=15 --user-agent=$user_agent -O - $urlOnline | \
+			grep -Eo 'data-latest-firefox="[0-9\.]+"' | grep -Eo '[0-9\.]+')"
+	verEsr="$(wget -q --tries=2 --timeout=15 --user-agent=$user_agent -O - $urlOnline | \
+			grep -Eo 'data-esr-versions="[0-9 \.]+"' | grep -Eo ' [0-9\.]+' | grep -Eo '[0-9\.]+')"
+	if [ -x /opt/firefox-latest/firefox ];  then versionInstall+="\n    Release: $(/opt/firefox-latest/firefox -v | grep -Eo '[0-9].*')"; fi
+	if [ -x /opt/firefox-esr/firefox ];     then versionInstall+="\n    ESR:     $(/opt/firefox-esr/firefox -v | grep -Eo '[0-9].*')"; fi
+	if [ -x /opt/firefox-aurora/firefox ];  then versionInstall+="\n    Aurora:  $(/opt/firefox-aurora/firefox -v | grep -Eo '[0-9].*')"; fi
+	if [ -x /opt/firefox-nightly/firefox ]; then versionInstall+="\n    Nightly: $(/opt/firefox-nightly/firefox -v | grep -Eo '[0-9].*')"; fi
+	if [ "$versionInstall" != "" ] && [ "$1" != "quiet" ]; then f__info "Firefox installé(s): $versionInstall"; fi
+	if [ "$1" != "quiet" ]; then f__info "Version Firefox en ligne:\n    Release: $verLatest\n    ESR:     $verEsr"; fi
+}
+
+	# install firefox, $1 canal à installer
 ffx_install(){
-
 	if ! f__root ; then f__error "vous devez être ROOT pour installer Firefox en tant que ROOT"; fi
-
+product=$1
 	ffx_godzilla
 	ffx_versionFF "quiet"