mirror of https://framagit.org/kyodev/kyopages.git
1.18.0
This commit is contained in:
parent
cfab989278
commit
bdf5f19dfb
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=1.17.0
|
||||
date="14/09/2017"
|
||||
version=1.18.0
|
||||
date="15/09/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
@ -52,6 +52,22 @@ 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
|
||||
[[ "$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
|
||||
}
|
||||
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $opType=upgrade
|
||||
f__error() { # v25/08/2017
|
||||
echo -e "\n$RED $script $version, erreur critique: $1 $COLOR"
|
||||
|
@ -223,38 +239,6 @@ EOF
|
|||
echo -e "$COLOR\n plus d'infos: $GREEN$urlNotice$COLOR\n"
|
||||
}
|
||||
|
||||
# assigne $context_appli, context_break
|
||||
fi__context(){
|
||||
context_break="\n"
|
||||
if [ -t 0 ]; then context_appli="terminal";
|
||||
elif [ -x /usr/bin/zenity ]; then context_appli="zenity";
|
||||
elif [ -x /usr/bin/kdialog ]; then context_appli="kdialog";
|
||||
else exit 1; fi
|
||||
}
|
||||
|
||||
# $1 oui|non, $2 message question, return 0 pour défaut, 1 sinon
|
||||
fi__dialog_oui_non () { # 30/08/2017
|
||||
[[ $1 =~ ^oui$|^non$ ]] || f__error "dialog_oui_non, erreur appel"
|
||||
local reply defaut
|
||||
[ "$1" == "oui" ] && defaut="oui" || defaut="non"
|
||||
case $context_appli in
|
||||
terminal )
|
||||
[ "$defaut" == "oui" ] && printf "$2 [O/n] " || printf "$2 [o/N] "
|
||||
read -r reply ;;
|
||||
zenity )
|
||||
zenity --question --text="$2" || reply="n" ;;
|
||||
kdialog )
|
||||
kdialog --yesno "$2" || reply="n" ;;
|
||||
esac
|
||||
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
|
||||
}
|
||||
|
||||
fi_cpu(){ # 30/08/2017
|
||||
local cpu_addr cpu_bogomips cpu_flags memsys text
|
||||
cpu_addr="$(sed -n 's/^address sizes.*: \(.*\)$/\1/p' /proc/cpuinfo | head -n 1)"
|
||||
|
@ -1152,6 +1136,7 @@ export PATH TERM IFS
|
|||
fileOutput="getInfo_rapport.md"
|
||||
fileLogs="/var/log/sdeb_$script.log"
|
||||
fileDev="/opt/bin/fileDev"
|
||||
|
||||
f__affichage
|
||||
f__user && retourFUser=0 || retourFUser="$?"
|
||||
[ "$retourFUser" -eq 1 ] && f__error "user indéterminé, pour contourner, lancer le script avec:\n USER_INSTALL=user $0 \n"
|
||||
|
@ -1160,7 +1145,6 @@ if [ "$retourFUser" -eq 2 ]; then
|
|||
noHome="true"
|
||||
fi
|
||||
f__requis "gawk wget curl ip>iproute2" # requis pour fonctionnement programme
|
||||
fi__context
|
||||
|
||||
prg_1(){ # début
|
||||
rm "$fileOutput" &>/dev/null
|
||||
|
@ -1175,6 +1159,7 @@ prg_1(){ # début
|
|||
prg_2(){ # traitements principaux
|
||||
printf "."
|
||||
fi_systeme; printf "."
|
||||
# [ -e "$fileDev" ] && return
|
||||
fi_cpu; printf "."
|
||||
fi_gpu; printf "."
|
||||
fi_localisation; printf "."
|
||||
|
@ -1188,8 +1173,8 @@ prg_2(){ # traitements principaux
|
|||
fi_dmesg; printf ".\n"
|
||||
}
|
||||
prg_3(){ # fin de traitements
|
||||
echo -e "[rapport getInfo v$version]($urlNotice)\n" >> "$fileOutput"
|
||||
fi__dialog_oui_non "non" "exporter sur un pastebin par défaut?" || fipaste
|
||||
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__info "vous pouvez le visualiser avec $GREEN$script -l$COLOR"
|
||||
}
|
||||
|
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
## todo
|
||||
|
||||
## 1.18.0 15/09/2017
|
||||
|
||||
* correction suppression code gui-dialog en dev
|
||||
* ajout date en fin de rapport
|
||||
|
||||
## 1.17.0 14/09/2017
|
||||
|
||||
fix bug: id resume dans fi_disk
|
||||
|
|
Loading…
Reference in New Issue