Robot
/
kyopages
mirror of https://framagit.org/kyodev/kyopages.git
2
0
Fork 0
Code Issues Releases Wiki Activity

getInfo 2.41.2

This commit is contained in:
kyodev 2017-11-20 17:30:53 +01:00
parent 100d52cf84
commit 0fb314c063
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/getInfo
View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.41.1
version=2.41.2
date="20/11/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -377,7 +377,7 @@ f_dspl_alert(){ # 19/11/2017
# contrainte markdown:
# l'italique avec _ ou * n'est pas géré, trop d'interférences potentielles
# liste niveau2: 3 ou 4 caractères, niveau3: 6 ou 8 caractères, puce * ou -
f_dspl_md(){ # 19/11/2017
f_dspl_md(){ # 20/11/2017
local display display2 ifs_origin ligne
if [ ! -f "$1" ]; then
f__info "pas de rapport à afficher, vous devez lancer une analyse auparavant:" \
@ -406,7 +406,7 @@ f_dspl_md(){ # 19/11/2017
# #### TITRE 4 yellow
[[ "$ligne" =~ ^(#{4}[^#].*)$ ]] && ligne="\x1B[33m"${BASH_REMATCH[1]}"\x1B(B\x1B[m"
# interne message alert, red
[[ "$ligne" =~ ( ❗ .*)$ ]] && ligne="\x1B[31m"${BASH_REMATCH[1]}"\x1B(B\x1B[m"
[[ "$ligne" =~ ( ↯ .*)$ ]] && ligne="\x1B[31m"${BASH_REMATCH[1]}"\x1B(B\x1B[m"
# interne message indo, blue
[[ "$ligne" =~ ( ☛ .*)$ ]] && ligne="\x1B[34m"${BASH_REMATCH[1]}"\x1B(B\x1B[m"
# **gras**
@ -429,7 +429,6 @@ f_dspl_md(){ # 19/11/2017
display2+="$ligne\n"
done <<< "$display"
IFS="$ifs_origin"
#display2=${display2//\\/\\\\}
echo -e "$display2"
}
@ -1423,7 +1422,6 @@ fi_pkg_apt(){ #v3 20/11/2017
# $1 upgraded, $6 to remove, $10 not upgraded # => qte_upgradable [0]=upgraded, [1]=notUpgraded
qte_upgradable=($( gawk '/ newly installed/{print $1" "$10}' <<< $stck_upgd )) # tableau
[ "${qte_upgradable[0]}" ] || qte_upgradable=("-1" "-1") # si erreur
#[ "${qte_upgradable[0]}" ] || echo cond erreur
{
# upgrade
[ "${qte_upgradable[0]}" -gt 1 ] && pluriel="s" || unset pluriel
@ -3206,11 +3204,10 @@ prg_2(){ # traitements principaux 20/11/2017
if [[ "$1" == all || "$1" =~ s ]]; then #systeme, matériel -cs
echo -e "# ▷ Système \n\n" >> "$fileOutput"
for i in fi_systeme fi_cpu fi_mem fi_hw fi_batt fi_graph fi_disk fi_usb ; do
printf "•"
echo -n "•"
$i
done
fi
echo -n " "
if [[ "$1" == all || "$1" =~ c ]]; then #configuration #debian, packages -cc
echo -e "# ▷ Configuration \n\n" >> "$fileOutput"
for i in fi_locale fi_vrms fi_packagers ; do

4
scripts/getInfo_changelog.md
View File

@ -4,11 +4,11 @@
* ! f__requis, fscript_install, f__scandir
## 2.41.1 20/11/2017
## 2.41.2 20/11/2017
* révision: fi_graph, multi-cartes
* révision: fi_nm, cas ou pas de wifi à proximité, révision
* révision: fi_pkg_apt, test si erreur apt-update
* révision: fi_pkg_apt, protection et alerte si erreur apt-update
* fix mineurs: f_display, fi_reseau, affichage
## 2.40.2 19/11/2017