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

1.16

This commit is contained in:
kyodev 2017-09-14 16:11:39 +02:00
parent d1a43810a6
commit 3d4d893233
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/getInfo
View File

@ -1,7 +1,7 @@
#!/bin/bash
version=1.15.0
date="07/09/2017"
version=1.16.0
date="14/09/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
script="getInfo"
@ -277,14 +277,15 @@ fi_cpu(){ # 30/08/2017
echo -e "$text" >> "$fileOutput"
}
fi_disk(){ # 30/08/2017
local fstab disk_lsblk utilDisk resume idSwap idResume diskAta diskUsb diskMmc diskNvme text
fi_disk(){ # 14/09/2017
local fstab disk_lsblk utilDisk resume idResume idSwap diskAta diskUsb diskMmc diskNvme text
fstab="$(grep -vE '#|^$' /etc/fstab)"
disk_lsblk="$(lsblk -fi -o +SIZE -o +OWNER)"
utilDisk="$(df -h --output=source,target,fstype,size,used,avail,pcent --exclude=tmpfs --exclude=devtmpfs --exclude=devtmpfs | grep -Ev "devpts|none|proc|sys|tmpfs|udev")"
resume="$(grep -Ev '#|^$' /etc/initramfs-tools/conf.d/resume)"
idSwap="$(grep -vE '#|^$' /etc/fstab | grep 'swap' | grep 'UUID' | sed -E 's/^UUID=([0-9a-Z-]*).*/\1/')"
idResume="$(grep -Ev '#|^$' /etc/initramfs-tools/conf.d/resume | grep 'RESUME=' | grep 'UUID' | sed -E 's/^.*UUID=([0-9a-Z-]*).*/\1/')"
# idResume="$(grep -Ev '#|^$' /etc/initramfs-tools/conf.d/resume | sed -En 's/^[^[:blank:]{1,}][^#{1,}].*UUID=(.*)$/\1/p')"
idResume="$(grep -Ev '#|^$' /etc/initramfs-tools/conf.d/resume | sed -En 's/.*UUID=([0-9a-Z-]*).*$/\1/p')"
idSwap="$(grep -Ev '#|^$' /etc/fstab | sed -En 's/^UUID=([0-9a-Z-]*).*swap.*$/\1/p')"
diskAta="$(ls -l /dev/disk/by-id/ | awk '{ print $9, $11 }' | sed '/^ata/!d; /part/d; /\/sd/!d; s/^.*\(sd..*\)$/\1/')"
diskUsb="$(ls -l /dev/disk/by-id/ | awk '{ print $9, $11 }' | sed '/^usb/!d; /part/d; /\/sd/!d; s/^.*\(sd..*\)$/\1/')"
diskMmc="$(ls -l /dev/disk/by-id/ | awk '{ print $9, $11 }' | sed '/^mmc/!d; /part/d; /\/mmcblk/!d; s/^.*\(mmcblk..*\)$/\1/')"
@ -308,8 +309,10 @@ fi_disk(){ # 30/08/2017
text+='```\n'
text+="$resume \n"
text+='```\n\n'
if [ "$idSwap" ] && [ "$idResume" ] && [ "$idSwap"!="$idResume" ]; then
text+="_vérifier la config resume_, l'UUID ne semble pas correspondre à celui du swap. en cas de multi-boot, vous pouvez utiliser _RESUME=auto_ ou _RESUME=/dev/sdx_ \n\n"
if [ "$idSwap" ] && [ "$idResume" ] && [ "$idSwap" != "$idResume" ]; then
text+="id swap : $idSwap \n"
text+="id resume: $idResume \n"
text+="_vérifier la config resume_, l'UUID ne correspond pas à celui du swap. en cas de multi-boot. vous pouvez utiliser _RESUME=auto_ ou _RESUME=/dev/sdx_ \n\n"
fi
text+="**types de disque** \n\n"
[ "$diskAta" ] || diskAta="-"; text+="* ata: $diskAta \n"
@ -1170,6 +1173,9 @@ prg_1(){ # début
echo -e "Rapport au $dateRapport \n" >> "$fileOutput"
}
prg_2(){ # traitements principaux
fi_disk; printf "."
}
prg_22(){ # traitements principaux
printf "."
fi_systeme; printf "."
fi_cpu; printf "."

4
scripts/getInfo_changelog.md
View File

@ -2,6 +2,10 @@
## todo
## 1.16.0 14/09/2017
fix bug: id resume dans fi_disk
## 1.15.0 07/09/2017
* correction f_help