mirror of https://framagit.org/kyodev/kyopages.git
getFlashPlayer 3.20.0
This commit is contained in:
parent
d3371db4ef
commit
e224d4985d
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=3.19.0
|
||||
date="6/12/2017"
|
||||
version=3.20.0
|
||||
date="13/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getFlashPlayer"
|
||||
|
@ -193,11 +193,11 @@ f__user(){ # 3/12/2017
|
|||
# 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(){ # 5/12/2017
|
||||
f__wget_test(){ # 11/12/2017
|
||||
local file_test_wget retourWget retourHttp location
|
||||
|
||||
file_test_wget="/tmp/testWget-$$-$RANDOM"
|
||||
wget -Sq --timeout=10 --user-agent="$user_agent" --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="$?"
|
||||
[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
|
||||
[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
|
||||
|
@ -207,8 +207,8 @@ f__wget_test(){ # 5/12/2017
|
|||
[ "$retourWget" == 6 ] && retourWget="6: défaut authentification"
|
||||
[ "$retourWget" == 7 ] && retourWget="7: erreur de protocole"
|
||||
[ "$retourWget" == 8 ] && retourWget="8: réponse serveur en erreur"
|
||||
retourHttp="$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )"
|
||||
location="$( grep -i 'location' $file_test_wget | xargs )"
|
||||
retourHttp=$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )
|
||||
location=$( grep -i 'location' $file_test_wget | xargs )
|
||||
if [ "$2" == "test" ]; then
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
# spécial maintenance frama.link, pas de redirection sur page status framalink
|
||||
|
@ -232,8 +232,9 @@ f__wget_test(){ # 5/12/2017
|
|||
fi
|
||||
if [ "$retourWget" != "0" ]; then
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
# f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
|
||||
echo -e "$RED erreur wget, $retourWget \n $1 \n $YELLOW$retourHttp \n $location$STD"
|
||||
f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
|
||||
echo -e "$RED erreur wget, $retourWget \n $1 \n $YELLOW$retourHttp \n $location$STD" # pour les diags
|
||||
return 1
|
||||
fi
|
||||
if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
# changelog getFlashPlayer
|
||||
|
||||
|
||||
## getFlashPlayer 3.20.0 13/12/2017
|
||||
|
||||
* révision: f__wget_test
|
||||
|
||||
## 3.19.0 6/12/2017
|
||||
|
||||
* révision: fscript_update, controle chargement début et fin
|
||||
|
|
Loading…
Reference in New Issue