mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.62.0
This commit is contained in:
kyodev
parent
7d56ec829a
commit
df8b25b038
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.61.0
|
||||
date="9/12/2017"
|
||||
version=2.62.0
|
||||
date="11/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -166,59 +166,6 @@ f__unit_human(){ # 5/12/2017
|
|||
}' <<< $1 )"
|
||||
}
|
||||
|
||||
# test wget, $1=url à tester, 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(){ # 5/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"
|
||||
retourWget="$?"
|
||||
[ "$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"
|
||||
[ "$retourWget" == 4 ] && retourWget="4: défaut réseau"
|
||||
[ "$retourWget" == 5 ] && retourWget="5: défaut vérification SSL"
|
||||
[ "$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 )"
|
||||
if [ "$2" == "test" ]; then
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
# spécial maintenance frama.link, pas de redirection sur page status framalink
|
||||
[ "$( grep -c '303' <<< $retourHttp )" -ne 0 ] && return 1 # 303 See Other
|
||||
[ "$retourWget" == "0" ] && return 0 || return 1
|
||||
fi
|
||||
if [ "$2" == "print" ]; then
|
||||
if [ "$retourWget" != "0" ]; then
|
||||
echo "erreur wget: $RED$retourWget"
|
||||
echo -e "$BLUE $1$STD\t$RED $retourHttp"
|
||||
else
|
||||
echo -e "$BLUE $1$STD\t$GREEN $retourHttp"
|
||||
fi
|
||||
echo "$STD"
|
||||
fi
|
||||
if [ "$2" == "print" ] || [ "$2" == "loc" ]; then
|
||||
[ "$location" ] && echo -n "$YELLOW $location" || echo -n "$YELLOW no location"
|
||||
echo "$STD"
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
return 0
|
||||
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"
|
||||
fi
|
||||
if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
fi
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
exit 0
|
||||
}
|
||||
|
||||
# user ayant initié la session graphique, assigne $fu_user
|
||||
# return 1 sur échec identification user, return 2 sur absence home/
|
||||
# gestion variable environnement user avec: USER_INSTALL=<user> script
|
||||
|
|
@ -278,11 +225,11 @@ f__wcv(){ # 09/11/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?)"
|
||||
|
|
@ -292,8 +239,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
|
||||
|
|
@ -307,6 +254,7 @@ f__wget_test(){ # 5/12/2017
|
|||
else
|
||||
echo -e "$BLUE $1$STD\t$GREEN $retourHttp"
|
||||
fi
|
||||
echo "$STD"
|
||||
fi
|
||||
if [ "$2" == "print" ] || [ "$2" == "loc" ]; then
|
||||
[ "$location" ] && echo -n "$YELLOW $location" || echo -n "$YELLOW no location"
|
||||
|
|
@ -316,11 +264,12 @@ 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"
|
||||
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\n$STD"
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
fi
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
# changelog getInfo
|
||||
|
||||
## getInfo 2.61.0 11/12/2017
|
||||
|
||||
|
||||
## getInfo 2.62.0 11/12/2017
|
||||
|
||||
* révision figet_ip
|
||||
* révision fi_réseau +ipv6, alert slaac+mac
|
||||
* révision, fi_ssid, détection connexion wifi
|
||||
* révision: f__wget_test
|
||||
|
||||
## getInfo 2.60.0 9/12/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue