mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.20.0
This commit is contained in:
kyodev
parent
87cdd4908a
commit
53b045bc00
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.19.6
|
||||
date="28/10/2017"
|
||||
version=2.20.0
|
||||
date="29/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -1018,7 +1018,7 @@ fi_system_analyse(){ # 25/10/2017
|
|||
unset text
|
||||
}
|
||||
|
||||
fi_systeme(){ # 25/10/2017
|
||||
fi_systeme(){ # 29/10/2017
|
||||
local mbr description uname bootImage initDaemon xorg shells lastboot uptime charge pluriel text
|
||||
local alim_total alimentation
|
||||
[ -d /sys/firmware/efi ] && mbr="EFI" || mbr="Legacy (mbr)"
|
||||
|
|
@ -1051,7 +1051,7 @@ fi_systeme(){ # 25/10/2017
|
|||
figet_de
|
||||
figet_dmi
|
||||
figet_disk
|
||||
figet_distro
|
||||
figet_distrib
|
||||
figet_gpu
|
||||
figet_screen
|
||||
figet_shell
|
||||
|
|
@ -1066,7 +1066,7 @@ fi_systeme(){ # 25/10/2017
|
|||
text+="* GPU \n"
|
||||
text+="$(sed -E 's/(.*)/ \* \*\*\1\*\*/' <<<$fget_gpu) \n"
|
||||
text+="* boot **$mbr** \n"
|
||||
text+="* distribution **$fget_distro** \n\n"
|
||||
text+="* distribution **$fg_distrib** \n\n"
|
||||
text+='``` \n'
|
||||
text+="architecture: $architecture \n"
|
||||
[ "$description" ] && text+="description: $description \n"
|
||||
|
|
@ -1354,25 +1354,38 @@ figet_disk(){ #v2 19/10/2017
|
|||
[ "$fget_disk_nvme" ] || fget_disk_nvme="-" && fget_disk_nvme="$(tr ' ' '\n' <<< "$fget_disk_nvme" | sort | tr '\n' ' ')"
|
||||
}
|
||||
|
||||
#assigne fget_distro
|
||||
figet_distro(){ # thanks neofetch, assigne $fget_distro # 09/10/2017
|
||||
local distro file
|
||||
if type -p lsb_release >/dev/null; then distro="$(lsb_release -sd)";
|
||||
elif type -p guix >/dev/null; then distro="GuixSD";
|
||||
elif type -p crux >/dev/null; then distro="$(crux)";
|
||||
else
|
||||
# Source the os-release file
|
||||
for file in /etc/os-release /usr/lib/os-release /etc/*release /usr/lib/*release; do
|
||||
source "$file" && break
|
||||
done
|
||||
# Workarounds for distros that go against the os-release standard.
|
||||
[[ -z "${distro// }" ]] && distro="$(gawk '/BLAG/ {print $1; exit}' /etc/*ease /usr/lib/*ease)"
|
||||
[[ -z "${distro// }" ]] && distro="$(gawk -F '=' '{print $2; exit}' /etc/*ease /usr/lib/*ease)"
|
||||
# for debian, add version
|
||||
grep -qi 'Debian' /etc/issue && distro="$(sed 's/"//g' <<< $distro) $(< /etc/debian_version)"
|
||||
# assigne $fg_distrib
|
||||
figet_distrib(){ # 29/10/2017
|
||||
local prefix version
|
||||
# priorité /etc/os-release, version officielle systemd
|
||||
[ -e "/etc/os-release" ] && source "/etc/os-release" || source "/usr/lib/os-release"
|
||||
if [ "$PRETTY_NAME" ] && [ "${PRETTY_NAME,,}" != "Linux" ]; then
|
||||
fg_distrib="${PRETTY_NAME:-${NAME} ${ID}}" # si PRETTY_NAME null, alors tentative sur NAME et ID
|
||||
fg_distrib=${fg_distrib//'"'} # suppression "
|
||||
fi
|
||||
[[ -z "$distro" ]] && distro="$os (non déterminée)"
|
||||
fget_distro="$distro"
|
||||
# essai version sur fichier
|
||||
version=$(cat /etc/*version 2>/dev/null) # fichier *version?
|
||||
[[ $version =~ [0-9.]+ ]] || unset version # qui contient des chiffres
|
||||
# essai lsb_release, antique méthode
|
||||
[ "$fg_distrib" ] && [[ $(grep -is 'chrome-' /proc/version) || -f "/dev/cros_ec" ]] && fg_distrib="$(lsb_release -sd 2>/dev/null)/xhrome-os"
|
||||
[ "$fg_distrib" ] && [ $(grep -is 'microsoft' /proc/version) ] && fg_distrib="$(lsb_release -sd 2>/dev/null)/windows"
|
||||
[ "$fg_distrib" ] || fg_distrib=$(lsb_release -sd 2>/dev/null)
|
||||
# complément sur fichier éventuels *[_-][version|release]
|
||||
[ "$prefix" ] || prefix=$(ls /etc/*_version 2>/dev/null | sed -En 's#/etc/(.*)_version#\1#p')
|
||||
[ "$prefix" ] || prefix=$(ls /etc/*-version 2>/dev/null | sed -En 's#/etc/(.*)-version#\1#p')
|
||||
[ "$prefix" ] || prefix=$(ls /etc/*-release 2>/dev/null | grep -v 'os-release' | sed -En 's#/etc/(.*)-release#\1#p')
|
||||
# spécial complément
|
||||
[ "$prefix" == "redstar" ] && prefix="Red Star OS"
|
||||
[ "$prefix" ] && prefix=${prefix^} # 1er caractère majuscule
|
||||
# final
|
||||
if [[ "$fg_distrib" && ! "$fg_distrib" =~ $prefix ]]; then # si fg_distrib et ne contient pas prefix
|
||||
fg_distrib="$prefix - $fg_distrib $version"
|
||||
elif [ -z "$fg_distrib" ] && [ "$prefix" ]; then # si fg_distrib vide et si prefix
|
||||
fg_distrib="$prefix $version"
|
||||
else
|
||||
fg_distrib="$fg_distrib $version" # utilisation fg_distrib "normal"
|
||||
fi
|
||||
[ "$fg_distrib" ] || fg_distrib="${OS^} (indéterminé)"
|
||||
}
|
||||
|
||||
# informations DMI, assigne $fget_dmi
|
||||
|
|
@ -1757,6 +1770,19 @@ figet_test_batt(){ # 23/10/2017
|
|||
f_display "fg_batt" "var" "figet_batt"
|
||||
}
|
||||
|
||||
figet_test_distrib(){ # 29/10/2017
|
||||
local etc lsb
|
||||
etc=$(grep -Hs . /etc/*release /etc/*version)
|
||||
lsb=$(lsb_release -a 2>/dev/null)
|
||||
###
|
||||
figet_dmi
|
||||
f_display "fget_dmi" "var" "distrib test"
|
||||
f_display "etc" "cmd" "grep -Hs . /etc/*release /etc/*version"
|
||||
f_display "lsb" "cmd" "lsb_release -a"
|
||||
figet_distrib
|
||||
f_display "fg_distrib" "var" "fg_distrib"
|
||||
}
|
||||
|
||||
figet_test_dmi(){ # 21/10/2017
|
||||
local text var_temp
|
||||
text+="## dmi test \n\n"
|
||||
|
|
@ -2082,7 +2108,7 @@ function display_menu {
|
|||
reply="$(sed 's/-call/all/' <<< $reply)"
|
||||
exec $0 "$reply"
|
||||
}
|
||||
prg_alert_init(){ # 23/10/2017
|
||||
prg_alert_init(){ # 29/10/2017
|
||||
bashVersion=($(grep -o 'version 4' <<< $(bash --version)))
|
||||
[ ${bashVersion[1]} -ge 4 ] || f__error "bash v4 requis" \
|
||||
"version installée: $(sed -n '1p' <<< $(bash --version))"
|
||||
|
|
@ -2168,7 +2194,7 @@ for j in $options; do
|
|||
case $j in
|
||||
-t | --test )
|
||||
prg_1 "$*"
|
||||
fi_disk
|
||||
fi_systeme
|
||||
prg_3
|
||||
exit ;; # test seulement
|
||||
-c* | all )
|
||||
|
|
@ -2205,6 +2231,11 @@ for j in $options; do
|
|||
figet_test_batt
|
||||
prg_3
|
||||
exit ;; # test batterie avec scan /sys/class/power_supply/
|
||||
--debug-dist )
|
||||
prg_1 "$*"
|
||||
figet_test_distrib
|
||||
prg_3
|
||||
exit ;; # test distrib
|
||||
--debug-dmi )
|
||||
prg_1 "$*"
|
||||
figet_test_dmi
|
||||
|
|
|
|||
|
|
@ -8,9 +8,15 @@
|
|||
* revoir modules réseau
|
||||
* réviser alert_
|
||||
* finir révision vrms
|
||||
* bug aléatoire wwn, revoir filtrage
|
||||
|
||||
---
|
||||
|
||||
## 2.20.0 29/10/2017
|
||||
|
||||
* nouveau: figet_distrib
|
||||
* suppression: figet_distro neofetch
|
||||
|
||||
## 2.19.6 28/10/2017
|
||||
|
||||
* nouveaux: avertissement erreur display :0 en root fedora beta ou buster
|
||||
|
|
|
|||
Loading…
Reference in New Issue