diff --git a/docs/scripts/getFirefox.md b/docs/scripts/getFirefox.md index 5377a0c..d104181 100644 --- a/docs/scripts/getFirefox.md +++ b/docs/scripts/getFirefox.md @@ -218,8 +218,10 @@ les versions installées par ce script. nightly: 56.0a1 Version Firefox en ligne: - Release: 54.0.1 - ESR: 52.2.1 + Release : 54.0.1 + Beta/dev: 55.0b10 + Nightly : 56.0a1 + ESR : 52.2.1 _.-~-. 7'' Q..\ diff --git a/scripts/getFirefox b/scripts/getFirefox index 5da8e15..b2639d2 100755 --- a/scripts/getFirefox +++ b/scripts/getFirefox @@ -1,6 +1,6 @@ #!/bin/bash -version=0.5.3 +version=0.5.4 date="20/07/2017" projet="Kyodev" contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues" @@ -273,13 +273,21 @@ ffx_versionFF(){ stockUrlOnline="$(wget -q --tries=2 --timeout=15 --user-agent=$user_agent -O - $urlOnline)" verLatest="$(echo $stockUrlOnline | grep -Eo 'data-latest-firefox="[0-9\.]+"' | grep -Eo '[0-9\.]+')" verEsr="$(echo $stockUrlOnline | grep -Eo 'data-esr-versions="[0-9\.]+"' | grep -Eo '[0-9\.]+')" + fileTmp=sdxfcggbjkl-$RANDOM + recup_url="https://download.mozilla.org/?product=firefox-beta-latest&os=linux64&lang=fr" + wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp" + verBeta="$(cat $fileTmp | grep -i 'location' | sed -E 's/.*firefox-(.*)\.tar.bz2/\1/')" + recup_url="https://download.mozilla.org/?product=firefox-nightly-latest-l10n-ssl&os=linux64&lang=fr" + wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp" + verNightly="$(cat $fileTmp | grep -i 'location' | sed -E 's/.*firefox-(.*)\.fr.linux.*/\1/')" + rm "$fileTmp" for product in latest esr beta dev nightly; do if [ -x "$dirInstall$product/firefox" ]; then versionInstall+="\n $product: $($dirInstall$product/firefox -v | grep -Eo '[0-9].*')" fi done f__info "Firefox installé(s): $versionInstall" - f__info "Version Firefox en ligne:\n Release: $verLatest\n ESR: $verEsr" + f__info "Version Firefox en ligne:\n Release : $verLatest\n Beta/dev: $verBeta\n Nightly : $verNightly\n ESR : $verEsr" } # création lanceur.desktop diff --git a/scripts/getFirefox_changelog.md b/scripts/getFirefox_changelog.md index 4e3f548..2763e21 100644 --- a/scripts/getFirefox_changelog.md +++ b/scripts/getFirefox_changelog.md @@ -2,20 +2,20 @@ ## todo +* plus d'architecture? (arm)? * installation manuelle archive * téléchargement archive -* plus d'architecture? (arm)? * voir alternatives par ordre croissant, latest ou esr sinon beta sinon nightly (dev out) * améliorer les installations pour autres users -* version enligne autre que esr et release -## 0.5.3 20/07/17 +## 0.5.4 20/07/17 * fix bug: détection profil existant dans profile.ini * fix bug: architecture nightly amd64 * mieux: developer edition. malgré sa gestion autonome du profil, fonctionnement du script non modifié si jamais changement futur +* mieux version en ligne beta & nightly ## 0.5.0 19/07/17