mirror of
https://github.com/KittyKatt/screenFetch.git
synced 2026-04-24 03:00:16 -04:00
Merge pull request #350 from darealshinji/TrinityDE
detect Trinity DE and TWin (closes #122)
This commit is contained in:
darealshinji
@@ -15,7 +15,7 @@
|
||||
- Display release version and package count on TinyCore Linux
|
||||
- Display exact release version on Windows 10
|
||||
- Use modern logo on Windows 10 and Windows 8
|
||||
- Added detection for chromeos-wm, FLWM, howm, sway, LXQt and Deepin [DEs/WMs]
|
||||
- Added detection for Trinity/TWin, chromeos-wm, FLWM, howm, sway, LXQt and Deepin [DEs/WMs]
|
||||
- Added detection for Chrome OS, Chromium OS, PCLinuxOS, BunsenLabs, Kogaion, Msys, Netrunner, SteamOS, SailfishOS, Mer, Alpine, Qubes OS and Oracle Linux
|
||||
|
||||
v3.7.0
|
||||
|
||||
@@ -56,7 +56,7 @@ display_logo="no"
|
||||
|
||||
# WM & DE process names
|
||||
# Removed WM's: compiz
|
||||
wmnames=( fluxbox openbox blackbox xfwm4 metacity kwin icewm pekwm flwm flwm_topside fvwm dwm awesome wmaker stumpwm musca xmonad.* i3 ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder herbstluftwm howm notion bspwm cinnamon 2bwm echinus swm budgie-wm dtwm 9wm chromeos-wm deepin-wm sway )
|
||||
wmnames=( fluxbox openbox blackbox xfwm4 metacity kwin twin icewm pekwm flwm flwm_topside fvwm dwm awesome wmaker stumpwm musca xmonad.* i3 ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder herbstluftwm howm notion bspwm cinnamon 2bwm echinus swm budgie-wm dtwm 9wm chromeos-wm deepin-wm sway )
|
||||
denames=( gnome-session xfce-mcs-manage xfce4-session xfconfd ksmserver lxsession lxqt-session gnome-settings-daemon mate-session mate-settings-daemon Finder deepin )
|
||||
|
||||
# Screenshot Settings
|
||||
@@ -191,8 +191,8 @@ detectColors() {
|
||||
|
||||
supported_distros="Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SteamOS, TinyCore, Trisquel, Ubuntu, Viperr and Void."
|
||||
supported_other="Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+Msys."
|
||||
supported_dms="KDE, Gnome, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE and RazorQt."
|
||||
supported_wms="2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3."
|
||||
supported_dms="KDE, Gnome, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE, RazorQt and Trinity."
|
||||
supported_wms="2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, TWin, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3."
|
||||
|
||||
displayHelp() {
|
||||
printf "${underline}Usage${c0}:\n"
|
||||
@@ -1439,6 +1439,10 @@ detectde () {
|
||||
de = "Cinnamon"
|
||||
exit
|
||||
}
|
||||
else if ($1 ~ /^TDE_FULL_SESSION/) {
|
||||
de = "Trinity"
|
||||
exit
|
||||
}
|
||||
else if ($0 ~ /"xfce4"/) {
|
||||
de = "XFCE4"
|
||||
exit
|
||||
@@ -1494,6 +1498,7 @@ detectde () {
|
||||
if [ x"$DE" = x"" ]; then
|
||||
# classic fallbacks
|
||||
if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=KDE;
|
||||
elif [ x"$TDE_FULL_SESSION" != x"" ]; then DE=Trinity;
|
||||
elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=Gnome;
|
||||
elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=MATE;
|
||||
elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=Gnome;
|
||||
@@ -1536,6 +1541,9 @@ detectde () {
|
||||
Cinnamon)
|
||||
DE=Cinnamon
|
||||
;;
|
||||
trinity)
|
||||
DE=Trinity
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -1632,6 +1640,11 @@ detectde () {
|
||||
DEver="$(awk -F '=' '/Version/ {print $2}' /etc/deepin-version)"
|
||||
DE="${DE} ${DEver//* }"
|
||||
fi
|
||||
elif [[ ${DE} == "Trinity" ]]; then
|
||||
if type -p tde-config >/dev/null 2>&1; then
|
||||
DEver="$(tde-config --version | awk -F ' ' '/TDE:/ {print $2}')"
|
||||
DE="${DE} ${DEver//* }"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1716,6 +1729,7 @@ detectwm () {
|
||||
'subtle') WM="subtle";;
|
||||
'sway') WM="sway";;
|
||||
'swm') WM="swm";;
|
||||
'twin') WM="TWin";;
|
||||
'wmaker') WM="WindowMaker";;
|
||||
'wmfs') WM="WMFS";;
|
||||
'wmii') WM="wmii";;
|
||||
@@ -1798,6 +1812,7 @@ detectwm () {
|
||||
'subtle') WM="subtle";;
|
||||
'sway') WM="sway";;
|
||||
'swm') WM="swm";;
|
||||
'twin') WM="TWin";;
|
||||
'wmaker') WM="WindowMaker";;
|
||||
'wmfs') WM="WMFS";;
|
||||
'wmii') WM="wmii";;
|
||||
@@ -1940,6 +1955,22 @@ detectwmtheme () {
|
||||
'SpectrWM') Win_theme="Not Applicable";;
|
||||
'swm') Win_theme="Not Applicable";;
|
||||
'subtle') Win_theme="Not Applicable";;
|
||||
'TWin')
|
||||
if [[ -z $TDE_CONFIG_DIR ]]; then
|
||||
if type -p tde-config >/dev/null 2>&1; then
|
||||
TDE_CONFIG_DIR=$(tde-config --localprefix)
|
||||
fi
|
||||
fi
|
||||
if [[ -n $TDE_CONFIG_DIR ]]; then
|
||||
TDE_CONFIG_DIR=${TDE_CONFIG_DIR%/}
|
||||
if [[ -f $TDE_CONFIG_DIR/share/config/kcmthememanagerrc ]]; then
|
||||
Win_theme=$(awk '/CurrentTheme=/ {gsub(/CurrentTheme=/,"",$0); print $0; exit}' $TDE_CONFIG_DIR/share/config/kcmthememanagerrc)
|
||||
fi
|
||||
if [[ -z $Win_theme ]]; then
|
||||
Win_theme="Not Applicable"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
'WindowMaker') Win_theme="Not Applicable";;
|
||||
'WMFS') Win_theme="Not Applicable";;
|
||||
'wmii') Win_theme="Not Applicable";;
|
||||
|
||||
@@ -33,13 +33,13 @@ Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+Msys.
|
||||
Supported Desktop Managers:
|
||||
.IP
|
||||
.\" @supported_dms_start@
|
||||
KDE, Gnome, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE and RazorQt.
|
||||
KDE, Gnome, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE, RazorQt and Trinity.
|
||||
.\" @supported_dms_end@
|
||||
.PP
|
||||
Supported Window Managers:
|
||||
.IP
|
||||
.\" @supported_wms_start@
|
||||
2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3.
|
||||
2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, TWin, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3.
|
||||
.\" @supported_wms_end@
|
||||
|
||||
.SH OPTIONS
|
||||
|
||||
Reference in New Issue
Block a user