mirror of https://framagit.org/kyodev/kyopages.git
1.20.0
This commit is contained in:
parent
3573056096
commit
5f5a9d575e
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=1.19.0
|
||||
date="16/09/2017"
|
||||
version=1.20.0
|
||||
date="18/09/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
@ -13,23 +13,16 @@ urlNotice="https://kyodev.frama.io/kyopages/scripts/getInfo/"
|
|||
# contributeurs: kyodev
|
||||
#####
|
||||
|
||||
f__affichage(){ # v06/2017 définition couleurs
|
||||
YELLOW="$(printf "\033[0;33m")" # ?
|
||||
GREEN="$(printf "\033[0;32m")" # ok
|
||||
BLUE="$(printf "\033[0;34m")" # info
|
||||
RED="$(printf "\033[0;31m")" # alerte
|
||||
COLOR="$(printf "\033[0m")" # standard
|
||||
clear
|
||||
printf "$BLUE"
|
||||
cat << 'EOF'
|
||||
_ ___ __
|
||||
f__affichage(){ # v18/09/2017
|
||||
f__color
|
||||
affichage_text=" _ ___ __
|
||||
__ _ ___| |_|_ _|_ __ / _| ___
|
||||
/ _' |/ _ \ __|| || '_ \| |_ / _ \
|
||||
| (_| | __/ |_ | || | | | _| (_) |
|
||||
\__, |\___|\__|___|_| |_|_| \___/
|
||||
|___/
|
||||
EOF
|
||||
echo -e "$YELLOW version $version - $date$COLOR\n"
|
||||
"
|
||||
echo -e "$BLUE$affichage_text\n$YELLOW version $version - $date$COLOR\n"
|
||||
}
|
||||
|
||||
# detect system architecture, assign $architecture : 32bits, i686 | 64bits, amd64, return 1 on unknown architecture
|
||||
|
@ -52,20 +45,26 @@ f__architecture(){ # v08/2017 spécifique
|
|||
esac
|
||||
}
|
||||
|
||||
# $1=oui|non (réponse par défaut), $2=message, return 0 pour défaut, 1 sinon
|
||||
f__dialog_oui_non () { # 15/09/2017
|
||||
f__color(){ # v18/09/2017
|
||||
YELLOW="$(printf "\033[0;33m")" # question
|
||||
GREEN="$(printf "\033[0;32m")" # ok
|
||||
BLUE="$(printf "\033[0;34m")" # info
|
||||
RED="$(printf "\033[0;31m")" # alerte
|
||||
COLOR="$(printf "\033[0m")" # standard
|
||||
}
|
||||
|
||||
# $1=oui|non réponse par défaut, $2=message de la question, return 0 pour oui, 1 pour non
|
||||
f__dialog_oui_non () { # 18/09/2017
|
||||
local reply
|
||||
[[ "$1" =~ ^oui$|^non$ ]] || f__error "dialog_oui_non, erreur appel fonction"
|
||||
local reply defaut
|
||||
[ "$1" == "oui" ] && defaut="oui" || defaut="non"
|
||||
[ "$defaut" == "oui" ] && printf "$2 [O/n] " || printf "$2 [o/N] "
|
||||
read -r reply
|
||||
shopt -s nocasematch
|
||||
if [ "$defaut" == "oui" ]; then
|
||||
if [[ ! $reply =~ ^no?n?$ ]]; then return 0; else return 1; fi
|
||||
elif [ "$defaut" == "non" ]; then
|
||||
if [[ ! $reply =~ ^ou?i?$ ]]; then return 0; else return 1; fi
|
||||
fi
|
||||
shopt -u nocasematch
|
||||
printf "$BLUE $2"
|
||||
[ "$1" == "oui" ] && printf " [O/n] " || printf " [o/N] "
|
||||
printf "$COLOR"
|
||||
read -r reply
|
||||
if [ -z "$reply" ]; then
|
||||
[ "$1" == "oui" ] && reply="oui" || reply="non"
|
||||
fi
|
||||
if [[ ${reply,,} =~ ^ou?i?$ ]]; then return 0; else return 1; fi #*{,,} lowercase
|
||||
}
|
||||
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $opType=upgrade
|
||||
|
@ -77,7 +76,7 @@ f__error() { # v25/08/2017
|
|||
exit 1
|
||||
}
|
||||
|
||||
# affichage des paramètres en bleu, si $1=raw pas de ligne vide à la fin, si $1=log uniquement $2 logué
|
||||
# affichage des paramètres en bleu, si $1=raw pas de ligne vide à la fin, si $1=log $2 uniquement logué
|
||||
f__info() { # v25/08/2017
|
||||
local depart=1
|
||||
if [ "$1" == "raw" ] || [ "$1" == "log" ]; then depart=2; fi
|
||||
|
@ -1193,8 +1192,8 @@ prg_2(){ # traitements principaux
|
|||
}
|
||||
prg_3(){ # fin de traitements
|
||||
echo -e "[rapport getInfo v$version]($urlNotice)\t$(date '+%a %d/%m/%Y %k:%M:%S')\n" >> "$fileOutput"
|
||||
f__dialog_oui_non "non" "exporter sur un pastebin par défaut?" || fipaste
|
||||
f__info "\n$GREEN le rapport est disponible en local, fichier: $fileOutput"
|
||||
f__dialog_oui_non "non" "exporter sur un pastebin par défaut?" && fipaste
|
||||
f__info "\n$GREEN le rapport est disponible en local, fichier: $fileOutput"
|
||||
f__info "vous pouvez le visualiser avec $GREEN$script -l$COLOR"
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
# changelog getInfo
|
||||
|
||||
## todo
|
||||
|
||||
## 1.20.0 18/09/2017
|
||||
|
||||
* révision f__dialog_oui_non
|
||||
* révision f__affichage (f__color)
|
||||
|
||||
## 1.19.0 16/09/2017
|
||||
|
||||
|
|
Loading…
Reference in New Issue