EnumDev/stormfetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved DE/WM Detection

Browse Source
This commit is contained in:
CapCreeperGR 2024-05-08 14:12:38 +03:00
parent 139e64d682
commit 200e300be0
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/fetch_script.sh
View File

@ -11,7 +11,11 @@ if command_exists lshw; then
fi fi
echo "Memory: $(get_used_mem) MiB / $(get_total_mem) MiB" echo "Memory: $(get_used_mem) MiB / $(get_total_mem) MiB"
if xhost >& /dev/null ; then if xhost >& /dev/null ; then
echo "DE/WM: $(get_de_wm)" if get_de_wm &> /dev/null; then
echo "Screen Resolution: $(get_screen_resolution)" echo "DE/WM: $(get_de_wm)"
fi
if command_exists xdpyinfo ; then
echo "Screen Resolution: $(get_screen_resolution)"
fi
fi fi

26
config/fetch_script_functions.sh
View File

@ -51,16 +51,32 @@ get_used_mem() {
} }
get_de_wm() { get_de_wm() {
if [[ $DESKTOP_SESSION =~ "plasma" ]]; then if ps -e | grep "plasmashell" &> /dev/null ; then
echo "KDE Plasma $(plasmashell --version | sed 's/plasmashell //g')" echo "KDE Plasma $(plasmashell --version | awk '{print $2}')"
elif ps -e | grep "gnome-session" &> /dev/null ; then
echo "Gnome $(gnome-shell --version | awk '{print $3}')"
elif ps -e | grep "xfce4-session" &> /dev/null ; then
echo "XFCE $(xfce4-session --version | grep xfce4-session | awk '{print $2}')"
elif ps -e | grep "cinnamon" &> /dev/null ; then
echo "Cinnamon $(cinnamon --version | awk '{print $2}')"
elif ps -e | grep "mate-panel" &> /dev/null ; then
echo "Mate $(mate-about --version | awk '{print $4}')"
elif ps -e | grep "lxsession" &> /dev/null ; then
echo "LXDE"
elif ps -e | grep "sway" &> /dev/null ; then
echo "Sway $(sway --version | awk '{print $2}')"
elif ps -e | grep "icewm-session" &> /dev/null ; then
echo "IceWM $(icewm --version | awk '{print $2}' | sed 's/,//g')"
elif [ ! -z $DESKTOP_SESSION ]; then
echo "$DESKTOP_SESSION"
else else
echo "$DESKTOP_SESSION" return 1
fi fi
} }
get_screen_resolution() { get_screen_resolution() {
if xhost >& /dev/null ;then if xhost >& /dev/null && command_exists xdpyinfo; then
xdpyinfo | grep dimensions | tr -s ' ' | cut -d " " -f3 xdpyinfo | grep dimensions | tr -s ' ' | cut -d " " -f3
fi fi
} }