From 1f41bd8116bca9efc34bacfdc0eb75c5fd8336e2 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Thu, 26 Nov 2015 17:03:33 +0800 Subject: [PATCH] Add support for Deepin (DE&WM) --- screenfetch-dev | 20 ++++++++++++++++++-- screenfetch.1 | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 729a234..fc65b13 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -56,8 +56,8 @@ display_logo="no" # WM & DE process names # Removed WM's: compiz -wmnames=( fluxbox openbox blackbox xfwm4 metacity kwin icewm pekwm fvwm dwm awesome wmaker stumpwm musca xmonad.* i3 ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder herbstluftwm notion bspwm cinnamon 2bwm echinus swm budgie-wm dtwm 9wm chromeos-wm ) -denames=( gnome-session xfce-mcs-manage xfce4-session xfconfd ksmserver lxsession lxqt-session gnome-settings-daemon mate-session mate-settings-daemon Finder ) +wmnames=( fluxbox openbox blackbox xfwm4 metacity kwin icewm pekwm fvwm dwm awesome wmaker stumpwm musca xmonad.* i3 ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder herbstluftwm notion bspwm cinnamon 2bwm echinus swm budgie-wm dtwm 9wm chromeos-wm deepin-wm) +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 # This setting lets the script know if you want to take a screenshot or not. 1=Yes 0=No @@ -1403,6 +1403,9 @@ detectde () { gnome|gnome-fallback|gnome-fallback-compiz ) DE=Gnome ;; + deepin) + DE=Deepin + ;; esac if [ x"$DE" = x"" ]; then @@ -1520,6 +1523,11 @@ detectde () { DEver=$(unity --version) DE="${DE} ${DEver//* }" fi + elif [[ ${DE} == "Deepin" ]]; then + if [[ -f /etc/deepin-version ]]; then + DEver="$(awk -F '=' '/Version/ {print $2}' /etc/deepin-version)" + DE="${DE} ${DEver//* }" + fi fi fi @@ -1573,6 +1581,7 @@ detectwm () { 'chromeos-wm') WM="chromeos-wm";; 'cinnamon') WM="Muffin";; 'compiz') WM="Compiz";; + 'deepin-wm') WM="deepin-wm";; 'dminiwm') WM="dminiwm";; 'dwm') WM="dwm";; 'dtwm') WM="dtwm";; @@ -1647,6 +1656,7 @@ detectwm () { 'cinnamon') WM="Cinnamon";; 'chromeos-wm') WM="chromeos-wm";; 'compiz') WM="Compiz";; + 'deepin-wm') WM="Deepin WM";; 'dminiwm') WM="dminiwm";; 'dwm') WM="dwm";; 'e16') WM="E16";; @@ -1729,6 +1739,12 @@ detectwmtheme () { Win_theme=$(gconftool-2 -g /apps/metacity/general/theme) fi ;; + 'Deepin WM') + if type -p gsettings >/dev/null 2>&1; then + Win_theme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" + Win_theme=${Win_theme//"'"} + fi + ;; 'dminiwm') Win_theme="Not Applicable";; 'dwm') Win_theme="Not Applicable";; 'E16') Win_theme="$(awk -F"= " '/theme.name/ {print $2}' $HOME/.e16/e_config--0.0.cfg)";; diff --git a/screenfetch.1 b/screenfetch.1 index d18910e..bae8131 100644 --- a/screenfetch.1 +++ b/screenfetch.1 @@ -39,7 +39,7 @@ KDE, Gnome, Unity, Xfce, LXDE, Cinnamon, MATE, CDE and RazorQt. Supported Window Managers: .IP .\" @supported_wms_start@ -2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, Compiz, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FVWM, herbstluftwm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3. +2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, Compiz, Deepin, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FVWM, herbstluftwm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3. .\" @supported_wms_end@ .SH OPTIONS