From 3081f9f22a8b4a0c63fb092bed10938d4304b644 Mon Sep 17 00:00:00 2001 From: kyodev <> Date: Wed, 14 Feb 2018 16:48:53 +0100 Subject: [PATCH] getInfo 3.18.2 --- scripts/getInfo | 10 +++++----- scripts/getInfo_changelog.md | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/getInfo b/scripts/getInfo index da553e6..700dd67 100755 --- a/scripts/getInfo +++ b/scripts/getInfo @@ -1,6 +1,6 @@ #!/bin/bash -version=3.18.1 +version=3.18.2 date="14/02/2018" projet="simpledeb" contact="IRC freenode.net ##sdeb ou https://framagit.org/kyodev/kyopages/issues/" @@ -2456,7 +2456,7 @@ fi_touchpad(){ # 14/02/2018 fe_touchpad+="$REPLY "$'\n' done <<< $( grep -i 'Name=' <<< $device ) fe_touchpad=${fe_touchpad%$'\n'} # suppression \n final - cmd_device="grep -Ei -B1 -A8 'synaptics|alps|etps|elan' /proc/bus/input/devices" + cmd_device="grep -Ei -B1 -A8 'touchpad|trackpoint|synaptics|alps|etps|elan' /proc/bus/input/devices" # recherche Xorg.log toScrut=( /var/log/Xorg.0.log @@ -3181,7 +3181,7 @@ figet_cpu_uarch(){ # 14/11/2017 } # assigne $fg_de, $fg_de_panel -figet_de(){ # 13/02/2018 # thanks neofetch +figet_de(){ # 14/02/2018 # thanks neofetch local de="n/a" ps x_de=1 @@ -3219,8 +3219,8 @@ figet_de(){ # 13/02/2018 # thanks neofetch # panel ps=$( ps -A ) fg_de_panel=$( $c_awk ' - #inclus lxpanel, mate-panel, gnome-panel, xfceY-panel, lxqt-panel - /(gnome-shell|kicker|plasma-desktop|plasma-netbook|lxpanel|panel)$/ { print $NF; exit } + #inclus lxpanel, mate-panel, gnome-panel, xfce4-panel, lxqt-panel + /(gnome-shell|kicker|plasma-desktop|plasma-netbook|lxpanel|panel|deepin-dock|ede|sugar|theshell|kicker)$|liri-shell/ { print $NF; exit } ' <<< ${ps,,} ) } diff --git a/scripts/getInfo_changelog.md b/scripts/getInfo_changelog.md index 1d9942f..fca24e7 100644 --- a/scripts/getInfo_changelog.md +++ b/scripts/getInfo_changelog.md @@ -1,8 +1,9 @@ # changelog getInfo -## getInfo 3.18.1 14/02/2018 +## getInfo 3.18.2 14/02/2018 +* plus: figet_de, ajout panels * révision: fi_touchpad, titrage & motif grep devices * fix: fi_touchpad, affichages effacés par erreur dans 3.14