Robot
/
kyopages
mirror of https://framagit.org/kyodev/kyopages.git
2
0
Fork 0
Code Issues Releases Wiki Activity

getFirefox 3.14.2

This commit is contained in:
kyodev 2017-12-18 21:25:56 +01:00
parent 59ab8e2e74
commit 9064686194
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/getFirefox
View File

@ -1,7 +1,7 @@
#!/bin/bash
version=3.14.0
date="13/12/2017"
version=3.14.2
date="18/12/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
script="getFirefox"
@ -14,7 +14,9 @@ script="getFirefox"
# détection architecture système, assigne $fu_archi: linux|linux64
# return 1 on unknown architecture
# remarque, debian: dpkg --print-architecture affiche i386
f__architecture(){ # 4/12/2017 SPÉCIFIQUE
f__architecture(){ # 14/12/2017 SPÉCIFIQUE
x_architecture=1
case "$(uname -m)" in
amd64 | x86_64 )
fu_archi="linux64";;
@ -313,13 +315,13 @@ f_tor_get_version(){ # 5/12/2017
if [ -e "$dirInstallTB/Browser/TorBrowser/Docs/ChangeLog.txt" ]; then
verTorInstall="$(sed -n '1p' $dirInstallTB/Browser/TorBrowser/Docs/ChangeLog.txt | sed -En 's/^Tor Browser (.*)$/\1/p')"
fi
[ "$verTorInstall" ] || verTorInstall="$RED""Non Installé"
[ "$verTorInstall" ] || verTorInstall="$GREEN""Non Installé"
f__info "raw" "version Tor Browser en place: $GREEN$verTorInstall"
f__info "version Tor Browser en ligne: $YELLOW$verTorOnline"
}
# installation TorBrowser, [$1 manuel, $2 archive]
f_tor_install(){ # 4/12/2017
f_tor_install(){ # 18/12/2017
local dirTemp archi fileTemp recup_urlTb verArchive fileDesktop
[ "$EUID" -eq 0 ] || f__error "vous devez être ROOT pour installer Tor Browser"
@ -328,7 +330,7 @@ f_tor_install(){ # 4/12/2017
verArchive="$(sed -En 's/.*tor-browser-linux[0-9]{2}-(.*)\.tar\.xz.*$/\1/p' <<< $(basename $2))"
f__info "installation manuelle de Tor Browser version $verArchive ($2)"
dirTemp="$(dirname $2)/$script-$RANDOM"
fileTemp="$(basename $2)"
fileTemp=$( dirname $2 )/$( basename $2 )
mkdir -p "$dirTemp"
else
f__info "installation de Tor Browser"
@ -616,15 +618,15 @@ EOF
}
# installation Firefox, $1 produit, $2 manuel, $3 archive
ffx_install(){ # 4/12/2017
ffx_install(){ # 18/12/2017
[ "$EUID" -eq 0 ] || f__error "vous devez être ROOT pour installer Firefox"
local verArchive dirTemp fileTemp produit="$1"
if [ "$2" == "manuel" ]; then
verArchive="$(sed -E 's/.*firefox-(.*)\.linux.*$/\1/' <<< $(basename $3))"
f__info "installation manuelle dans $produit de firefox version $verArchive ($3)"
dirTemp="$(dirname $3)/$script-$RANDOM"
fileTemp="$(basename $3)"
mkdir -p "$dirTemp"
fileTemp=$( dirname $3 )/$( basename $3 )
mkdir -p "$dirTemp"
else
f__info "installation Firefox-$produit"
dirTemp="/tmp/$script-$RANDOM"
@ -635,7 +637,7 @@ ffx_install(){ # 4/12/2017
ffx_recup_url
wget -q -c --show-progress --tries=2 --timeout=15 --user-agent="$user_agent" -O "$fileTemp" "$recup_url"
if [ "$?" != "0" ]; then f__wget_test "$recup_url"; fi
f__archive_test "$fileTemp" || f__error "Le fichier $fileTemp n'est pas une archive tar.gz valide"
f__archive_test "$fileTemp" || f__error "Le fichier $fileTemp n'est pas une archive tar.bz2 valide"
echo
fi
# décompression archive téléchargée dans dossier de travail
@ -1236,5 +1238,8 @@ exit 0
### END CONTROL (contrôle chargement)
wget -O getFirefox https://framagit.org/kyodev/kyopages/raw/master/scripts/getFirefox
wget -O getFirefox https://frama.link/getFirefox
chmod +x getFirefox && ./getFirefox
wget -O getFirefox https://framagit.org/kyodev/kyopages/raw/master/scripts/getFirefox

9
scripts/getFirefox_changelog.md
View File

@ -1,5 +1,14 @@
# changelog getFirefox
## getFirefox 3.14.2 18/12/2017
* fix: install manuelle, bug potentiel
## getFirefox 3.14.1 15/12/2017
* syncro f__architecture
## getFirefox 3.14.0 13/12/2017
* révision: f__wget_test