mirror of https://framagit.org/kyodev/kyopages.git
getXfox 4.3.0
This commit is contained in:
kyodev
parent
0b5cade113
commit
6a2a800ced
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=4.2.1
|
||||
version=4.3.0
|
||||
date="24/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -199,16 +199,16 @@ f__user(){ # 3/12/2017
|
|||
return 0
|
||||
}
|
||||
|
||||
# test wget, $1=url à tester, sortie du script (même si url testée ok) avec affichage erreur ou ok
|
||||
# test wget, $1=url à tester, $2=''|print|loc|test
|
||||
# par défaut, sortie du script (même si url testée ok) avec affichage erreur ou ok
|
||||
# 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(){ # 23/12/2017
|
||||
local file_test_wget="/tmp/testWget-$script" retourWget retourHttp location wget_log="/tmp/testWget_$RANDOM.log"
|
||||
f__wget_test(){ # 24/12/2017
|
||||
local file_test_wget="/tmp/testWget-$script" retourWget retourHttp location
|
||||
|
||||
wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" -o "$wget_log" --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="$?"
|
||||
rm "$wget_log"
|
||||
[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
|
||||
[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
|
||||
[ "$retourWget" == 3 ] && retourWget="3: erreur Entrée/sortie fichier"
|
||||
|
|
@ -221,7 +221,6 @@ f__wget_test(){ # 23/12/2017
|
|||
location=$( grep -i 'location' $file_test_wget | xargs )
|
||||
if [ "$2" == "test" ]; then
|
||||
rm -f "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
# spécial maintenance frama.link, pas de redirection sur page status framalink
|
||||
grep -q '303' <<< $retourHttp && return 1 # 303 See Other
|
||||
[ "$retourWget" == "0" ] && return 0 || return 1
|
||||
|
|
@ -236,15 +235,13 @@ f__wget_test(){ # 23/12/2017
|
|||
echo "$STD"
|
||||
fi
|
||||
if [ "$2" == "print" ] || [ "$2" == "loc" ]; then
|
||||
[ "$location" ] && echo -n "$YELLOW $location" || echo -n "$YELLOW no location"
|
||||
[ "$location" ] && echo -n "$YELLOW$location" || echo -n "$YELLOW""no location"
|
||||
echo "$STD"
|
||||
rm -f "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
return 0
|
||||
fi
|
||||
if [ "$retourWget" != "0" ]; then
|
||||
rm "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
rm -f "$file_test_wget"
|
||||
f__error "wget, erreur $retourWget" "$1" "$YELLOW$retourHttp" "$location"
|
||||
echo -e "$RED erreur wget, $retourWget \n $1 \n $YELLOW$retourHttp \n $location$STD" # pour les diags
|
||||
return 1
|
||||
|
|
@ -252,8 +249,7 @@ f__wget_test(){ # 23/12/2017
|
|||
if grep -q '200' <<< $retourHttp; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
fi
|
||||
rm "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
rm -f "$file_test_wget"
|
||||
exit 0
|
||||
}
|
||||
|
||||
|
|
@ -348,13 +344,14 @@ f_tor_get_version(){ # 23/12/2017
|
|||
[ "$?" -ne 0 ] && f__wget_test "$recup_url"
|
||||
ver_tor_online=$( sed -En 's/^.*torbrowser\/([0-9.]*)\/.*_fr\.tar\.xz.*$/\1/p' $fileTmp | sed -n '1p' )
|
||||
rm "$fileTmp"
|
||||
[ "$ver_tor_online" ] || ver_tor_online="$RED""n/a"
|
||||
|
||||
# version installée
|
||||
if [ -e "$dirInstallTor/Browser/TorBrowser/Docs/ChangeLog.txt" ]; then
|
||||
ver_tor_install=$( sed -n '1p' $dirInstallTor/Browser/TorBrowser/Docs/ChangeLog.txt | sed -En 's/^Tor Browser (.*)$/\1/p' )
|
||||
fi
|
||||
[ "$ver_tor_install" ] || ver_tor_install="$GREEN""Non Installé"
|
||||
|
||||
[ "$ver_tor_install" ] || ver_tor_install="Non Installé"
|
||||
[ "$ver_tor_online" ] || ver_tor_online="$RED""n/a"
|
||||
[ "$1" == "quiet" ] && return 0
|
||||
|
||||
f__info "raw" "$appli en place: $GREEN$ver_tor_install"
|
||||
|
|
@ -457,28 +454,23 @@ f_tor_lanceur_desktop(){ # 23/12/2017
|
|||
}
|
||||
|
||||
# version personnalisation en ligne, [$1=quiet], assigne $perso_tor_afaire
|
||||
f_tor_pers_get_version(){ # 23/12/2017
|
||||
local verEnPlace verPersOnline personnalisationATraiter appli="Tor browser"
|
||||
f_tor_pers_get_version(){ # 24/12/2017
|
||||
local verPersEnPlace verPersOnline personnalisationATraiter appli="Tor browser"
|
||||
|
||||
x_tor_pers_get_version=1
|
||||
if [ -e "$profilTor/personnalisation" ]; then
|
||||
verEnPlace=$( sed -n '2p' $profilTor/personnalisation )
|
||||
verPersEnPlace=$( sed -n '2p' $profilTor/personnalisation )
|
||||
fi
|
||||
verPersOnline=$( wget -q --tries=2 --timeout=15 -o "$wget_log" -O - "$urlPersTor/$userTor" | sed -En 's/\/\*v(.*)\*\//\1/p' )
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlPersTor/$userTor"
|
||||
if [ -z "$verPersOnline" ]; then
|
||||
verPersOnline="$RED""non accessible"
|
||||
fi
|
||||
if [[ -e "$profilTor/personnalisation" && "$verEnPlace" != "$verPersOnline" ]]; then
|
||||
if [[ -e "$profilTor/personnalisation" && "$verPersEnPlace" != "$verPersOnline" ]]; then
|
||||
perso_tor_afaire="true"
|
||||
fi
|
||||
|
||||
[ "$verPersEnPlace" ] || verPersEnPlace="Non Installé"
|
||||
[ "$verPersOnline" ] || verPersOnline="$RED""n/a"
|
||||
[ "$1" == "quiet" ] && return 0
|
||||
if [ "$verEnPlace" ]; then
|
||||
f__info "raw" "perso. $appli en place: $GREEN$verEnPlace"
|
||||
else
|
||||
f__info "raw" "perso. $appli en place:$GREEN Non installé"
|
||||
fi
|
||||
|
||||
f__info "raw" "perso. $appli en place: $GREEN$verPersEnPlace"
|
||||
f__info "perso. $appli en ligne: $YELLOW$verPersOnline"
|
||||
}
|
||||
|
||||
|
|
@ -569,7 +561,7 @@ f_tor_remove(){ # 23/12/2017
|
|||
}
|
||||
|
||||
# assigne $ver_wfx_online $ver_wfx_install $recup_url_wfx, [$1=quiet]
|
||||
f_wfx_get_version(){ # 23/12/2017
|
||||
f_wfx_get_version(){ # 24/12/2017
|
||||
local appli="Waterfox" fileTmp="/tmp/$script-getVersion_${appli// }"
|
||||
local recup_url="https://www.waterfoxproject.org/downloads" recup_urlWfx verWfOnline
|
||||
|
||||
|
|
@ -580,14 +572,16 @@ f_wfx_get_version(){ # 23/12/2017
|
|||
ver_wfx_online=$( sed -En 's/^.*linux64\/.*waterfox-([0-9.]*)\..*\.tar\..*$/\1/p' $fileTmp )
|
||||
recup_url_wfx=$( sed -En 's/^.*<a href=\"(http.*waterfox.*\.linux-x86_64\.tar\.bz2)\">.*$/\1/p' $fileTmp )
|
||||
rm "$fileTmp"
|
||||
[ "$verWfOnline" ] || verWfOnline="$RED""n/a"
|
||||
|
||||
# version installée
|
||||
if [ -x "$dirInstallWfx/waterfox" ]; then
|
||||
ver_wfx_install=$( $dirInstallWfx/waterfox -v | grep -Eo '[0-9].*' )
|
||||
fi
|
||||
[ "$ver_wfx_install" ] || ver_wfx_install="$GREEN""Non Installé"
|
||||
|
||||
[ "$verWfOnline" ] || verWfOnline="$RED""n/a"
|
||||
[ "$ver_wfx_install" ] || ver_wfx_install="Non Installé"
|
||||
[ "$1" == "quiet" ] && return 0
|
||||
|
||||
f__info "raw" "$appli en place: $GREEN$ver_wfx_install"
|
||||
f__info "$appli en ligne: $YELLOW$ver_wfx_online"
|
||||
}
|
||||
|
|
@ -699,28 +693,25 @@ f_wfx_lanceur_desktop(){ # 23/12/2017
|
|||
}
|
||||
|
||||
# version personnalisation en ligne, [$1=quiet], assigne $perso_wfx_afaire
|
||||
f_wfx_pers_get_version(){ # 23/12/2017
|
||||
local verEnPlace verPersOnline appli="Waterfox"
|
||||
f_wfx_pers_get_version(){ # 24/12/2017
|
||||
local verPersEnPlace verPersOnline appli="Waterfox"
|
||||
|
||||
x_wfx_pers_get_version=1
|
||||
if [ -e "$profilWfx/personnalisation" ]; then
|
||||
verEnPlace=$( sed -n '2p' $profilWfx/personnalisation )
|
||||
verPersEnPlace=$( sed -n '2p' $profilWfx/personnalisation )
|
||||
fi
|
||||
|
||||
verPersOnline=$( wget -q --tries=2 --timeout=15 -o "$wget_log" -O - "$urlPersWfx/$userWfx" | sed -En 's/\/\*v(.*)\*\//\1/p' )
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlPersWfx/$userWfx"
|
||||
if [ -z "$verPersOnline" ]; then
|
||||
verPersOnline="$RED""non accessible"
|
||||
fi
|
||||
if [[ -e "$profilWfx/personnalisation" && "$verEnPlace" != "$verPersOnline" ]]; then
|
||||
if [[ -e "$profilWfx/personnalisation" && "$verPersEnPlace" != "$verPersOnline" ]]; then
|
||||
perso_wfx_afaire="true"
|
||||
fi
|
||||
|
||||
[ "$verPersEnPlace" ] || verPersEnPlace="Non Installé"
|
||||
[ "$verPersOnline" ] || verPersOnline="$RED""n/a"
|
||||
[ "$1" == "quiet" ] && return 0
|
||||
if [ "$verEnPlace" ]; then
|
||||
f__info "raw" "perso. $appli en place: $GREEN$verEnPlace"
|
||||
else
|
||||
f__info "raw" "perso. $appli en place:$GREEN Non installé"
|
||||
fi
|
||||
|
||||
f__info "raw" "perso. $appli en place: $GREEN$verPersEnPlace"
|
||||
f__info "perso. $appli en ligne: $YELLOW$verPersOnline"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# getXfox
|
||||
|
||||
## getXfox 4.2.1 - 24/12/2017
|
||||
## getXfox 4.3.0- 24/12/2017
|
||||
|
||||
* cosmétique
|
||||
* fix: f__wget_test, incompatible avec redirection logs
|
||||
* fix: typo fscript_update
|
||||
* fix: mineur, function script update
|
||||
|
||||
## getXfox 4.1.0 - 23/12/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue