diff --git a/docs/scripts/getFirefox.md b/docs/scripts/getFirefox.md index a25d752..638c4a1 100644 --- a/docs/scripts/getFirefox.md +++ b/docs/scripts/getFirefox.md @@ -177,10 +177,9 @@ vVVv vVVv ': |_| |_| |_|\___/___|_|_|_|\__,_| '' en savoir plus [Mozilla ESR](https://developer.mozilla.org/fr/Firefox/Firefox_ESR) les canaux par ordre croissant de versions: -` ESR <= release < beta < nightly ` +` ESR <= release < beta==dev edition < nightly ` -la version **aurora** (ainsi que **developer edition**?) sont en cours d'abandon et fusionnent -avec la version beta +la version **aurora** est abandonnée et la **developer edition** est basée sur la version beta ## mise à jour Firefox diff --git a/scripts/diag_getFirefox b/scripts/diag_getFirefox index ddadbe7..6732bac 100755 --- a/scripts/diag_getFirefox +++ b/scripts/diag_getFirefox @@ -16,17 +16,18 @@ for architecture in linux linux64; do echo "" echo "Architecture: $architecture" echo "=====================" - for product in latest esr beta nightly; do -#[ "$product" == "devedition" ]; then -# recup_url="https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=$architecture&lang=fr" - if [ "$product" == "latest" ]; then + for product in latest esr beta nightly dev; do + if [ "$product" == "latest" ]; then recup_url="https://download.mozilla.org/?product=firefox-$product&os=$architecture&lang=fr" elif [ "$product" == "esr" ]; then recup_url="https://download.mozilla.org/?product=firefox-$product-latest&os=$architecture&lang=fr" elif [ "$product" == "beta" ]; then recup_url="https://download.mozilla.org/?product=firefox-beta-latest&os=$architecture&lang=fr" elif [ "$product" == "nightly" ]; then - recup_url="https://download.mozilla.org/?product=firefox-$product-latest-l10n-ssl&os=linux&lang=fr" ;fi + recup_url="https://download.mozilla.org/?product=firefox-$product-latest-l10n-ssl&os=linux&lang=fr" + elif [ "$product" == "dev" ]; then + recup_url="https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=$architecture&lang=fr" + fi f__testWget "$product" "$recup_url" done @@ -35,10 +36,10 @@ done rm tempoTest echo "" -exitError +exit ### liens - +https://www.mozilla.org/fr/firefox/channel/desktop/ https://download-installer.cdn.mozilla.net/pub/firefox/releases/latest/README.txt https://download-installer.cdn.mozilla.net/pub/firefox/releases/latest-beta/README.txt https://www.mozilla.org/fr/firefox/channel/desktop/ diff --git a/scripts/getFirefox b/scripts/getFirefox index b507bba..d30dcfd 100755 --- a/scripts/getFirefox +++ b/scripts/getFirefox @@ -1,7 +1,7 @@ #!/bin/bash -version=0.5.0 -date="19/07/2017" +version=0.5.1 +date="20/07/2017" projet="Kyodev" contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues" script="getFirefox" @@ -321,7 +321,7 @@ ffx_profileCopy(){ ffx_profileIni(){ fileProfil="/home/$user_/.mozilla/firefox/profiles.ini" #si profil existant, sortir - if [ "$(grep -rc 'Name=$product' $fileProfil)" != 0 ]; then return; fi + if [ "$(grep -rc Name=$product $fileProfil)" != 0 ]; then return; fi #comptage profils existants nbProfiles="$(grep -rEc '\[Profile[0-9]+\]' $fileProfil)" #création profil @@ -335,7 +335,6 @@ ffx_profileIni(){ sed -i 's/Default=1//' "$fileProfil" echo "Default=1" >> "$fileProfil" else echo "" >> "$fileProfil"; fi -return } # calcul url téléchargement, assigne $recup_url diff --git a/scripts/getFirefox_changelog.md b/scripts/getFirefox_changelog.md index 353feb0..b538030 100644 --- a/scripts/getFirefox_changelog.md +++ b/scripts/getFirefox_changelog.md @@ -4,11 +4,18 @@ * installation manuelle archive * téléchargement archive -* version enligne autre que esr et release * plus d'architecture? (arm)? * voir alternatives par ordre croissant, latest ou esr sinon beta sinon nightly * récupérer icône aurora pour beta? -* améliorer les installation pour autres users +* améliorer les installations pour autres users +* version enligne autre que esr et release +* dev edition? + + +## 0.5.1 20/07/17 + +* fix bug: détection profil existant dans profile.ini + ## 0.5.0 19/07/17