mirror of https://framagit.org/kyodev/kyopages.git
getInfo 1.33.0
This commit is contained in:
kyodev
parent
c919210c40
commit
8dfa7ca6a3
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=1.32.2
|
||||
date="02/10/2017"
|
||||
version=1.33.0
|
||||
date="03/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -266,13 +266,11 @@ fi_batt(){ # 28/09/2017
|
|||
echo -e "$text" >> "$fileOutput"
|
||||
}
|
||||
|
||||
fi_cpu(){ # 02/10/2017
|
||||
local cpu_addr cpu_bogomips cpu_flags memsys swappiness text
|
||||
fi_cpu(){ # 03/10/2017
|
||||
local cpu_addr cpu_bogomips cpu_flags text
|
||||
cpu_addr="$(sed -n 's/^address sizes.*: \(.*\)$/\1/p' /proc/cpuinfo | sed -n '1p')"
|
||||
cpu_bogomips="$(sed -n 's/^bogomips.*: \(.*\)$/\1/p' /proc/cpuinfo | sed -n '1p')"
|
||||
cpu_flags="$(sed -n 's/^flags.*: \(.*\)$/\1/p;' /proc/cpuinfo | sed -n '1p')"
|
||||
memsys="$(free -ht)"
|
||||
swappiness="$(cat /proc/sys/vm/swappiness)"
|
||||
###
|
||||
text="## processeur / mémoire \n\n"
|
||||
figet_cpu
|
||||
|
|
@ -285,10 +283,18 @@ fi_cpu(){ # 02/10/2017
|
|||
text+='```\n'
|
||||
text+="$cpu_flags \n"
|
||||
text+='```\n\n'
|
||||
echo -e "$text" >> "$fileOutput"
|
||||
}
|
||||
|
||||
fi_mem(){ # 03/10/2017
|
||||
local memsys swappiness text
|
||||
memsys="$(free -hwt)"
|
||||
swappiness="$(cat /proc/sys/vm/swappiness)"
|
||||
###
|
||||
figet_memory
|
||||
text+='```\n'
|
||||
text+="mémoire Ram utilisée/totale: $figet_memory \n\n"
|
||||
text+="mémoire système: $memsys \n\n"
|
||||
text+="$memsys \n\n"
|
||||
text+="swappiness: $swappiness \n"
|
||||
text+='```\n\n'
|
||||
echo -e "$text" >> "$fileOutput"
|
||||
|
|
@ -593,7 +599,7 @@ fi_reseau(){ # 01/10/2017
|
|||
text+='```\n'
|
||||
text+="$route \n"
|
||||
text+='```\n\n'
|
||||
text+='`cat /etc/resolv.conf` \n'
|
||||
text+='`cat /etc/resolv.conf` serveurs de noms DNS utilisés par défaut \n'
|
||||
text+='```\n'
|
||||
text+="$resolv \n"
|
||||
text+='```\n\n'
|
||||
|
|
@ -906,7 +912,7 @@ figet_cpu() { # thanks neofetch, assigne $figet_cpu # 02/10/2017
|
|||
figet_cpu="$cpu"
|
||||
}
|
||||
|
||||
figet_de() { # thanks neofetch, assigne $figet_de #02/10/2017
|
||||
figet_de() { # thanks neofetch, assigne $figet_de #03/10/2017
|
||||
# local de="${XDG_CURRENT_DESKTOP/i3}" #supprime i3??...
|
||||
local de="$XDG_CURRENT_DESKTOP"
|
||||
de="${de/'X-'}"
|
||||
|
|
@ -927,11 +933,8 @@ figet_de() { # thanks neofetch, assigne $figet_de #02/10/2017
|
|||
de="$(cinnamon --version)"
|
||||
de="${de:-Cinnamon}"
|
||||
;;
|
||||
*"xfce4"*)
|
||||
de="xfce4"
|
||||
;;
|
||||
*"xfce5"*)
|
||||
de="xfce5"
|
||||
*"xfce"*)
|
||||
de="xfce" # suppression xfce4 ou xfce5 (la version ne sort pas dans xprop ou $XDG_
|
||||
;;
|
||||
esac
|
||||
figet_de="${de,,}"
|
||||
|
|
@ -1146,15 +1149,22 @@ figet_ip_public(){ # 02/10/2017
|
|||
fi
|
||||
}
|
||||
|
||||
figet_memory() { # thanks neofetch, assigne $figet_memory # 02/10/2017
|
||||
figet_memory() { # thanks neofetch, assigne $figet_memory # 03/10/2017
|
||||
# MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable
|
||||
# Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
|
||||
local mem_used mem_total a b
|
||||
while IFS=":" read -r a b; do
|
||||
case "$a" in
|
||||
"MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;;
|
||||
"Shmem") mem_used="$((mem_used+=${b/kB}))" ;;
|
||||
"MemFree" | "Buffers" | "Cached" | "SReclaimable") mem_used="$((mem_used-=${b/kB}))" ;;
|
||||
"MemTotal" )
|
||||
mem_used="$((mem_used+=${b/kB}))"
|
||||
mem_total="${b/kB}"
|
||||
;;
|
||||
"Shmem" )
|
||||
mem_used="$((mem_used+=${b/kB}))"
|
||||
;;
|
||||
"MemFree" | "Buffers" | "Cached" | "SReclaimable" )
|
||||
mem_used="$((mem_used-=${b/kB}))"
|
||||
;;
|
||||
esac
|
||||
done < /proc/meminfo
|
||||
mem_used="$((mem_used / 1024))"
|
||||
|
|
|
|||
|
|
@ -7,14 +7,24 @@
|
|||
* hasher les cmds pour gain temps exécution?
|
||||
* option erreur pour f__info
|
||||
* réorganiser en famille à afficher avec option de choix possible
|
||||
* swap
|
||||
* revoir figet_ip, gateway
|
||||
* éviter 169.254.10.12/16 ( enp3s0 ) (ethernet) si non branché
|
||||
* éviter 169.254.10.12/16 ( enp3s0 ) (ethernet) si non branché
|
||||
---
|
||||
* f__wget_test
|
||||
* comment f__user getInfo
|
||||
|
||||
## 1.32.1 02/10/2017
|
||||
|
||||
## 1.34.0 04/10/2017
|
||||
|
||||
* révision figet_memory
|
||||
* swap
|
||||
|
||||
## 1.33.0 03/10/2017
|
||||
|
||||
* séparation figet cpu/mem
|
||||
* figet_de: correction mineures fonction neofetch (en aveugle)
|
||||
|
||||
## 1.32.2 02/10/2017
|
||||
|
||||
* révision sed s/
|
||||
* fi_systeme: boot image avec options
|
||||
|
|
@ -22,7 +32,7 @@
|
|||
* révision nommage variable fonction neofetch
|
||||
* variables de boucles en local
|
||||
* f__user, premier essai root only, fonctionnement en root, function à réviser
|
||||
* figet_battery, alim, correction si AC au miue de AC0
|
||||
* figet_battery, alim, correction si AC au lieu de AC0
|
||||
|
||||
## 1.31.0 01/10/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue