mirror of https://framagit.org/kyodev/kyopages.git
getInfo 3.0.0
This commit is contained in:
kyodev
parent
a452d25c29
commit
6302965f55
199
scripts/getInfo
199
scripts/getInfo
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.70.0
|
||||
date="18/12/2017"
|
||||
version=3.0.0
|
||||
date="24/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -35,6 +35,7 @@ f__architecture(){ # 14/12/2017
|
|||
}
|
||||
|
||||
f__color(){ # 08/10/2017
|
||||
|
||||
YELLOW=$(tput setaf 3) # question
|
||||
GREEN=$(tput setaf 2) # ok
|
||||
BLUE=$(tput setaf 4) # info
|
||||
|
|
@ -95,7 +96,7 @@ f__dir(){ # 12/12/2017
|
|||
fi
|
||||
}
|
||||
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $opType=upgrade
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $operation=upgrade
|
||||
f__error(){ # 18/12/2017
|
||||
local depart=1 i
|
||||
|
||||
|
|
@ -104,7 +105,7 @@ f__error(){ # 18/12/2017
|
|||
echo -e " $BLUE${!i}$STD"
|
||||
done
|
||||
echo
|
||||
[ "$opType" == "upgrade" ] && f__log "$script $version: $1"
|
||||
[ "$operation" == "upgrade" ] && f__log "$script $version: $1"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
|
@ -122,11 +123,12 @@ f__info(){ # 18/12/2017
|
|||
|
||||
# log spécifique, fichier log limité à 10000 octets, $1 message à loguer
|
||||
f__log(){ # 4/12/2017
|
||||
if [ -w "$scriptLogs" ]; then
|
||||
if [ "$(stat -c %s $scriptLogs)" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "$scriptLogs"
|
||||
|
||||
if [ -w "$script_logs" ]; then
|
||||
if [ "$(stat -c %s $script_logs)" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "$script_logs"
|
||||
else
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null >> "$scriptLogs"
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null >> "$script_logs"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -171,7 +173,7 @@ f__requis(){ # 4/12/2017
|
|||
}
|
||||
|
||||
# $1=cmd si $2: nb de tentatives pour s'identifier, sinon 2 tentatives par défaut, suppose bash existant
|
||||
f__sudo(){ # 18/12/2017
|
||||
f__sudo(){ # 23/12/2017
|
||||
local nb=2 sudo isudo toBash
|
||||
|
||||
type -p bash &>/dev/null && toBash=$( type -p bash ) || return 2
|
||||
|
|
@ -181,7 +183,7 @@ f__sudo(){ # 18/12/2017
|
|||
else
|
||||
sudo="su --shell $toBash --preserve-environment -c "
|
||||
fi
|
||||
[ "$2" ] && nb="$2"
|
||||
[ "$2" ] && nb=$(( "$2" ))
|
||||
for (( isudo=1 ; isudo<="$nb" ; isudo++ )); do
|
||||
$sudo " $1"
|
||||
[ "$?" == 0 ] && break
|
||||
|
|
@ -253,16 +255,16 @@ f__wcv(){ # 09/11/2017
|
|||
[ "$1" == "-wv" ] && echo "$2" | grep -o "$3" | grep -c .
|
||||
}
|
||||
|
||||
# $1=url à tester, sortie du script (même si url testée ok) avec affichage erreur ou ok
|
||||
# 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(){ # 11/12/2017
|
||||
local file_test_wget retourWget retourHttp location
|
||||
f__wget_test(){ # 23/12/2017
|
||||
local file_test_wget="/tmp/testWget-$script" retourWget retourHttp location wget_log="/tmp/testWget_$RANDOM.log"
|
||||
|
||||
file_test_wget="/tmp/testWget-$$-$RANDOM"
|
||||
wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
|
||||
wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" -o "$wget_log" --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"
|
||||
|
|
@ -274,14 +276,15 @@ f__wget_test(){ # 11/12/2017
|
|||
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
|
||||
rm -f "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
# spécial maintenance frama.link, pas de redirection sur page status framalink
|
||||
[ "$( grep -c '303' <<< $retourHttp )" -ne 0 ] && return 1 # 303 See Other
|
||||
grep -q '303' <<< $retourHttp && 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 "erreur wget: erreur $RED$retourWget"
|
||||
echo -e "$BLUE $1$STD\t$RED $retourHttp"
|
||||
else
|
||||
echo -e "$BLUE $1$STD\t$GREEN $retourHttp"
|
||||
|
|
@ -291,19 +294,22 @@ f__wget_test(){ # 11/12/2017
|
|||
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
|
||||
rm -f "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
return 0
|
||||
fi
|
||||
if [ "$retourWget" != "0" ]; then
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
|
||||
rm "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
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
|
||||
fi
|
||||
if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then
|
||||
if grep -q '200' <<< $retourHttp; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
fi
|
||||
rm "$file_test_wget" 2>/dev/null
|
||||
rm "$file_test_wget"
|
||||
rm -f "$wget_log"
|
||||
exit 0
|
||||
}
|
||||
|
||||
|
|
@ -319,7 +325,7 @@ f__which(){ # 27/11/2017
|
|||
}
|
||||
|
||||
f_affichage(){ # 2/12/2017
|
||||
f__color
|
||||
|
||||
local affichage_text=" _ ___ __
|
||||
__ _ ___| |_|_ _|_ __ / _| ___
|
||||
/ _' |/ _ \ __|| || '_ \| |_ / _ \
|
||||
|
|
@ -487,7 +493,7 @@ toDisplay=(
|
|||
for ligne in "${toDisplay[@]}"; do
|
||||
echo -e "$ligne"
|
||||
done
|
||||
echo -e "$STD\n plus d'infos: $GREEN$urlNotice\n$STD"
|
||||
echo -e "$STD\n plus d'infos: $GREEN$url_notice\n$STD"
|
||||
}
|
||||
|
||||
# $1=texte à épurer
|
||||
|
|
@ -2073,11 +2079,15 @@ fi_serial(){ #v9 1/12/2017
|
|||
echo -e "$text\n"
|
||||
}
|
||||
|
||||
fi_ssid(){ #v2 11/12/2017
|
||||
fi_ssid(){ #v2 24/12/2017
|
||||
local nm_ssid text
|
||||
local fileOutput="/tmp/$RANDOM-$RANDOM" # ré-assigne sortie pour f_dspl
|
||||
|
||||
[ "$EUID" -eq 0 ] || f__error "Root requis"
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "vous devez être$RED ROOT$BLUE pour installer ce script dans le système"
|
||||
f__sudo "exec $0 --ssid"
|
||||
return $?
|
||||
fi
|
||||
[ $( f__which nmcli ) ] || f__error "NetworkManager requis"
|
||||
# connexion wifi?
|
||||
/sbin/iwconfig 2>/dev/null | grep -iq ssid || f__error "pas de connexion en wifi"
|
||||
|
|
@ -3455,7 +3465,7 @@ figet_ip(){ # 15/12/2017
|
|||
}
|
||||
|
||||
# $1=-4|-6, assigne $fg_ip_pub
|
||||
figet_ip_pub(){ #v 14/12/2017
|
||||
figet_ip_pub(){ #v 24/12/2017
|
||||
local dig_test ip_test iip
|
||||
|
||||
list_ip4(){ # testé 11/12/2017
|
||||
|
|
@ -3531,7 +3541,7 @@ figet_ip_pub(){ #v 14/12/2017
|
|||
fi
|
||||
# WGET
|
||||
if type -p wget &>/dev/null && [ -z "$fg_ip_pub" ]; then
|
||||
cmd="wget --quiet --timeout=2 --tries=1 -O - "
|
||||
cmd="wget --quiet --timeout=2 --tries=1 -o /dev/null -O - "
|
||||
for iip in ${ip_test[*]}; do
|
||||
fg_ip_pub=$( $cmd $iip )
|
||||
[ "$fg_ip_pub" ] && break
|
||||
|
|
@ -3978,7 +3988,7 @@ fipaste_curl_markdownshare(){ # à tester/finir
|
|||
}
|
||||
|
||||
# inscription dans tache upgrade en anacron hebdomadaire, via cron horaire, $1=upgrade|install|remove
|
||||
fscript_cronAnacron(){ # 4/12/2017
|
||||
fscript_cronAnacron(){ # 22/12/2017
|
||||
local dirAnacron dirSpool fileAnacron
|
||||
|
||||
[ "$( type -t fscript_cronAnacron_special )" ] && fscript_cronAnacron_special # test, si fonction spécifique, appel
|
||||
|
|
@ -3990,10 +4000,10 @@ fscript_cronAnacron(){ # 4/12/2017
|
|||
install | upgrade )
|
||||
mkdir -p "$dirAnacron"
|
||||
# table anacron
|
||||
echo "7 10 $script nice $scriptInstall --upgrade 1>/dev/null" > "$fileAnacron" # juste erreurs en syslog
|
||||
echo "7 10 $script nice $script_install --upgrade 1>/dev/null" > "$fileAnacron" # juste erreurs en syslog
|
||||
## anacron journalier pour dev logname
|
||||
if [ -e "$fileDev" ]; then
|
||||
echo "1 00 $script""Dev nice $scriptInstall --upgrade 1>/dev/null" >> "$fileAnacron"
|
||||
echo "1 00 $script""Dev nice $script_install --upgrade 1>/dev/null" >> "$fileAnacron"
|
||||
fi
|
||||
# création spool anacron utilisateur
|
||||
mkdir -p "$dirSpool"
|
||||
|
|
@ -4002,8 +4012,7 @@ fscript_cronAnacron(){ # 4/12/2017
|
|||
# crontab pour activation horaire anacron
|
||||
echo "@hourly $fu_user /usr/sbin/anacron -t $fileAnacron -S $dirSpool" >> /etc/crontab
|
||||
fi
|
||||
[ "$( grep "$script" /etc/crontab )" ] || echo f__error "inscription crontab" \
|
||||
"certains systèmes semblent poser poser problème, merci de rapporter ce bug à $projet, $contact"
|
||||
grep -q "$script" "/etc/crontab" || echo f__error "inscription crontab"
|
||||
;;
|
||||
remove )
|
||||
rm "$dirSpool/$script"* &>/dev/null
|
||||
|
|
@ -4013,29 +4022,38 @@ fscript_cronAnacron(){ # 4/12/2017
|
|||
esac
|
||||
}
|
||||
|
||||
# version script en ligne, [$1=update], assigne $versionScript, $script_aJour=ok|ko
|
||||
fscript_get_version(){ # 5/12/2017
|
||||
local var_temp
|
||||
# version script en ligne, [$1=update], assigne $ver_script_install, $ver_script_online, $script_aJour=ok|KO
|
||||
fscript_get_version(){ # 23/12/2017
|
||||
local wget_log="/tmp/wget_$RANDOM.log"
|
||||
|
||||
f__info "raw" "version script en cours: $GREEN$version"
|
||||
versionScript=$( wget -q --timeout=15 -O - "$urlScript" | grep -m1 '^version=' | cut -d'=' -f2 )
|
||||
if [ "$versionScript" ]; then
|
||||
if [ "$version" != "$versionScript" ]; then
|
||||
[ "$1" == "update" ] && var_temp=", mise à jour en cours" || var_temp=", mise à jour possible"
|
||||
script_aJour="ko"
|
||||
x_script_get_version=1
|
||||
if [ -e "$script_install" ]; then
|
||||
ver_script_install=$( grep -m1 '^version=' $script_install | cut -d'=' -f2 )
|
||||
fi
|
||||
[ "$ver_script_install" ] || ver_script_install="Non installé"
|
||||
f__info "raw" "script en place: $GREEN$ver_script_install"
|
||||
ver_script_online=$( wget -q --timeout=15 -o "$wget_log" -O - "$url_script" | grep -m1 '^version=' | cut -d'=' -f2 )
|
||||
if [ "$?" -ne 0 ]; then
|
||||
rm "$wget_log"
|
||||
f__wget_test "$url_script"
|
||||
fi
|
||||
if [ "$ver_script_online" ]; then
|
||||
if [ "$ver_script_install" != "$ver_script_online" ]; then
|
||||
script_aJour="KO"
|
||||
else
|
||||
script_aJour="ok"
|
||||
fi
|
||||
f__info "version script en ligne: $YELLOW$versionScript$BLUE$var_temp"
|
||||
f__info "script en ligne: $YELLOW$ver_script_online"
|
||||
else
|
||||
f__info "version script en ligne$RED non accessible"
|
||||
fi
|
||||
rm "$wget_log"
|
||||
}
|
||||
|
||||
# installation du script dans le système
|
||||
fscript_install(){ # 4/12/2017
|
||||
# installation du script dans le système, fscript_install_special possible
|
||||
fscript_install(){ # 22/12/2017
|
||||
|
||||
if grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
if grep -q 'bin' <<< "$( dirname $0 )" ; then
|
||||
f__info "$RED""l'installation dans le système doit se faire depuis un script local $GREEN(./$script -i )"
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -4048,27 +4066,27 @@ fscript_install(){ # 4/12/2017
|
|||
f__requis "wget anacron cron" || exit 1
|
||||
# install /opt
|
||||
mkdir -p /opt/bin/
|
||||
cp -d "$( basename $0 )" "$scriptInstall"
|
||||
ln -s "$scriptInstall" "/usr/bin/$script" &>/dev/null
|
||||
chmod 775 "$scriptInstall" # rwx rwx r-x, proprio fu_user
|
||||
cp -d "$0" "$script_install"
|
||||
ln -s "$script_install" "/usr/bin/$script" &>/dev/null
|
||||
chmod 775 "$script_install" # rwx rwx r-x, proprio fu_user
|
||||
# cron/anacron install
|
||||
fscript_cronAnacron "install"
|
||||
# création fichier log
|
||||
touch "$scriptLogs"
|
||||
chmod 664 "$scriptLogs" # rw- rw- r--, proprio fu_user
|
||||
chown "$fu_user:" "$scriptLogs" "$scriptInstall"
|
||||
[ -e "$fileDev" ] || rm "$( basename $0 )" &>/dev/null ## on efface pas si fileDev (dev)
|
||||
touch "$script_logs"
|
||||
chmod 664 "$script_logs" # rw- rw- r--, proprio fu_user
|
||||
chown "$fu_user:" "$script_logs" "$script_install"
|
||||
[ -e "$fileDev" ] || rm "$0" &>/dev/null ## on efface pas si fileDev (dev)
|
||||
f__info "log" "$script $version installé dans le système." "maintenant, appel du script par: $GREEN$script$BLUE (sans ./)"
|
||||
}
|
||||
|
||||
# suppression du script dans le système
|
||||
fscript_remove(){ # 4/12/2017
|
||||
# suppression du script dans le système, fscript_remove_special possible
|
||||
fscript_remove(){ # 22/12/2017
|
||||
|
||||
if ! grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
if ! grep -q 'bin' <<< "$( dirname $0 )" ; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -r)"
|
||||
return 1
|
||||
fi
|
||||
if [ ! -x "$scriptInstall" ];then
|
||||
if [ ! -x "$script_install" ];then
|
||||
f__info "$RED$script n'est pas installé"
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -4078,42 +4096,48 @@ fscript_remove(){ # 4/12/2017
|
|||
return $?
|
||||
fi
|
||||
[ "$( type -t fscript_remove_special )" ] && fscript_remove_special # test, si fonction spécifique, appel
|
||||
# suppression de /opt
|
||||
rm "$scriptInstall" &>/dev/null
|
||||
# suppression de /opt lien /usr/bin
|
||||
rm "$script_install" &>/dev/null
|
||||
unlink "/usr/bin/$script" &>/dev/null
|
||||
# cron/anacron remove
|
||||
fscript_cronAnacron "remove"
|
||||
f__info "log" "$script $version supprimé du système."
|
||||
}
|
||||
|
||||
# mise à jour script si dispo, v2, +update spécifique
|
||||
fscript_update(){ # 18/12/2017
|
||||
local dirTemp="/tmp/$script-$RANDOM"
|
||||
# mise à jour script
|
||||
fscript_update(){ # 23/12/2017
|
||||
local dirTemp="/tmp/$script-maj" wget_log="/tmp/wget_$RANDOM.log"
|
||||
|
||||
[ "$(type -t fscript_update_special)" ] && fscript_update_special # test, si fonction spécifique, appel
|
||||
if [ -z "$updateSpecial" ] && ! grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
if [ -z "$updateSpecial" ] && ! grep -q 'bin' <<< "$( dirname $0 )" ; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -u)"
|
||||
return 1
|
||||
fi
|
||||
fscript_get_version "update"
|
||||
(( x_script_get_version == 1 )) || fscript_get_version
|
||||
if [ "$script_aJour" == "ok" ]; then
|
||||
f__info "log" "pas de mise à jour disponible pour $script $version"
|
||||
return 0
|
||||
else
|
||||
f__info "mise à jour en cours"
|
||||
fi
|
||||
mkdir -p "$dirTemp"
|
||||
wget -q --tries=2 --timeout=15 -O "$dirTemp/$script" "$urlScript"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlScript"
|
||||
if grep -q '#!/bin/bash' "$dirTemp/$script" && grep -q '^### END CONTROL' "$dirTemp/$script"; then
|
||||
cp -d "$dirTemp/$script" "$scriptInstall"
|
||||
chmod 775 "$scriptInstall" # rwx rwx r-x, proprio fu_user
|
||||
chown "$fu_user:" "$scriptInstall"
|
||||
[ -z "$updateSpecial" ] && fscript_cronAnacron "upgrade"
|
||||
f__info "log" "$script mis à jour en version $versionScript $updateSpecial"
|
||||
else
|
||||
wget -q --tries=2 --timeout=15 -o "$wget_log" -O "$dirTemp/$script" "$url_script"
|
||||
if [ "$?" -ne 0 ]; then
|
||||
rm -rf "$dirTemp/"
|
||||
f__error "échec update" "mauvais téléchargement, réessayer plus tard"
|
||||
rm -f "$wget_log"
|
||||
f__wget_test "$url_script"
|
||||
fi
|
||||
if grep -q '#!/bin/bash' "$dirTemp/$script" && grep -q '^### END CONTROL' "$dirTemp/$script"; then
|
||||
cp -d "$dirTemp/$script" "$script_install"
|
||||
chmod 775 "$script_install" # rwx rwx r-x, proprio fu_user
|
||||
chown "$fu_user:" "$script_install"
|
||||
[ -z "$updateSpecial" ] && fscript_cronAnacron "upgrade"
|
||||
f__info "log" "$script mis à jour en version $ver_script_online $updateSpecial"
|
||||
else
|
||||
f_info "log" "$script: échec update" "mauvais téléchargement, réessayer plus tard"
|
||||
fi
|
||||
rm -rf "$dirTemp/"
|
||||
rm -f "$wget_log"
|
||||
}
|
||||
|
||||
prg_init(){ # 4/12/2017
|
||||
|
|
@ -4179,6 +4203,9 @@ prg_init(){ # 4/12/2017
|
|||
|
||||
# detect rapide systeme deb
|
||||
[ $( f__which dpkg ) ] && ENV_DEBIAN="oui"
|
||||
|
||||
# définition couleurs
|
||||
f__color
|
||||
}
|
||||
prg_1(){ # début 2/12/2017
|
||||
echo > "$fileOutput"
|
||||
|
|
@ -4284,22 +4311,22 @@ options="$(sed -E 's/--debug-paste//g; s/-t[0-9]+//g' <<< $options | xargs)" # n
|
|||
|
||||
# paramètres généraux
|
||||
[ "$pasteDuration" ] || pasteDuration=7 # durée de conservation standard du paste en jours
|
||||
fileOutput="getInfo_rapport.md"
|
||||
scriptInstall="/opt/bin/$script"
|
||||
scriptLogs="/var/log/sdeb_$script.log"
|
||||
fileDev="/opt/bin/fileDev"
|
||||
urlScript="https://frama.link/getInfo"
|
||||
urlNotice="https://frama.link/doc-getInfo"
|
||||
# test sur frama.link ok, sinon fallback sur framagit
|
||||
fileOutput="getInfo_rapport.md"
|
||||
script_install="/opt/bin/$script"
|
||||
script_logs="/var/log/sdeb_$script.log"
|
||||
url_script="https://frama.link/getInfo"
|
||||
url_notice="https://frama.link/doc-getInfo"
|
||||
# test si frama.link ok, sinon fallback sur framagit
|
||||
if [[ "$options" =~ all|-d|-h|-c|-v ]]; then
|
||||
if ! f__wget_test "$urlScript" "test"; then
|
||||
urlScript="https://framagit.org/kyodev/kyopages/raw/master/scripts/$script"
|
||||
urlNotice="https://kyodev.frama.io/kyopages/scripts/getInfo/"
|
||||
if ! f__wget_test "$url_script" "test"; then
|
||||
url_script="https://framagit.org/kyodev/kyopages/raw/master/scripts/$script"
|
||||
url_notice="https://kyodev.frama.io/kyopages/scripts/getInfo/"
|
||||
fi
|
||||
fi
|
||||
|
||||
spc5=$'\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0'
|
||||
ligneRapport="Rapport du $(date '+%d/%m/%Y %H:%M %z')$spc5◇$spc5$0 $*$spc5◇$spc5[$script $version]($urlNotice)"
|
||||
ligneRapport="Rapport du $(date '+%d/%m/%Y %H:%M %z')$spc5◇$spc5$0 $*$spc5◇$spc5[$script $version]($url_notice)"
|
||||
|
||||
# traitement options menu catégories
|
||||
for k in $options; do
|
||||
|
|
@ -4374,7 +4401,7 @@ for j in $options; do
|
|||
-us )
|
||||
opType="upgrade" # log si f__error
|
||||
updateSpecial="update spécial actif"
|
||||
scriptInstall="$(dirname $0)/$script"
|
||||
script_install="$(dirname $0)/$script"
|
||||
fscript_update
|
||||
exit ;; # upgrade spécial
|
||||
-v | --version )
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
# changelog getInfo
|
||||
|
||||
|
||||
## getInfo 3.0.0 24/12/2017
|
||||
|
||||
* syncro: nouveau composants scripts
|
||||
* révision: fi_ssid, : f_sudo
|
||||
* révision: figet_ip_pub, wget, définition logs, pour cause de bug wget? sur testing
|
||||
|
||||
## getInfo 2.70.0 18/12/2017
|
||||
|
||||
*syncro: f__archive_test, f__error, f__info, f__sudo, fscript_cronAnacron, fscript_get_version,
|
||||
|
|
|
|||
Loading…
Reference in New Issue