github/screenFetch
1
1
Fork 0
mirror of https://github.com/KittyKatt/screenFetch.git synced 2026-01-09 22:37:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

This should fix PR #550. Secondary WM check was preventing proper formatting and name check of WMs.

Browse Source
This commit is contained in:
Brett Bohnenkamper
2018-04-13 00:20:33 -05:00
parent 89e7433c45
commit 3df218521f
1 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
screenfetch-dev
View File

@@ -2130,67 +2130,68 @@ detectwm () {
WM=$(echo $(WM=${WM//*= }; echo ${WM//\"}))
fi
fi
else
if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then
if [[ ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -gt 1 ]] || [[ ${BASH_VERSINFO[0]} -gt 4 ]]; then
WM=${WM,,}
else
WM="$(tr '[:upper:]' '[:lower:]' <<< ${WM})"
fi
else
WM="$(tr '[:upper:]' '[:lower:]' <<< ${WM})"
fi
case ${WM} in
*'gala'*) WM="Gala";;
'2bwm') WM="2bwm";;
'awesome') WM="Awesome";;
'beryl') WM="Beryl";;
'blackbox') WM="BlackBox";;
'budgiewm') WM="BudgieWM";;
'chromeos-wm') WM="chromeos-wm";;
'cinnamon') WM="Cinnamon";;
'compiz') WM="Compiz";;
'deepin-wm') WM="Deepin WM";;
'dminiwm') WM="dminiwm";;
'dwm') WM="dwm";;
'e16') WM="E16";;
'echinus') WM="echinus";;
'emerald') WM="Emerald";;
'enlightenment') WM="E17";;
'fluxbox') WM="FluxBox";;
'flwm'|'flwm_topside') WM="FLWM";;
'fvwm') WM="FVWM";;
'gnome shell'*) WM="Mutter";;
'herbstluftwm') WM="herbstluftwm";;
'howm') WM="howm";;
'i3') WM="i3";;
'icewm') WM="IceWM";;
'kwin') WM="KWin";;
'metacity') WM="Metacity";;
'monsterwm') WM="monsterwm";;
'muffin') WM="Muffin";;
'musca') WM="Musca";;
'mutter'*) WM="Mutter";;
'mwm') WM="MWM";;
'notion') WM="Notion";;
'openbox') WM="OpenBox";;
'pekwm') WM="PekWM";;
'ratpoison') WM="Ratpoison";;
'sawfish') WM="Sawfish";;
'scrotwm') WM="ScrotWM";;
'spectrwm') WM="SpectrWM";;
'stumpwm') WM="StumpWM";;
'subtle') WM="subtle";;
'sway') WM="sway";;
'swm') WM="swm";;
'twin') WM="TWin";;
'wmaker') WM="WindowMaker";;
'wmfs') WM="WMFS";;
'wmii') WM="wmii";;
'xfwm4') WM="Xfwm4";;
'xmonad') WM="XMonad";;
esac
fi
# Proper format WM names that need it.
if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then
if [[ ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -gt 1 ]] || [[ ${BASH_VERSINFO[0]} -gt 4 ]]; then
WM_lower=${WM,,}
else
WM_lower="$(tr '[:upper:]' '[:lower:]' <<< ${WM})"
fi
else
WM_lower="$(tr '[:upper:]' '[:lower:]' <<< ${WM})"
fi
case ${WM_lower} in
*'gala'*) WM="Gala";;
'2bwm') WM="2bwm";;
'awesome') WM="Awesome";;
'beryl') WM="Beryl";;
'blackbox') WM="BlackBox";;
'budgiewm') WM="BudgieWM";;
'chromeos-wm') WM="chromeos-wm";;
'cinnamon') WM="Cinnamon";;
'compiz') WM="Compiz";;
'deepin-wm') WM="Deepin WM";;
'dminiwm') WM="dminiwm";;
'dwm') WM="dwm";;
'e16') WM="E16";;
'echinus') WM="echinus";;
'emerald') WM="Emerald";;
'enlightenment') WM="E17";;
'fluxbox') WM="FluxBox";;
'flwm'|'flwm_topside') WM="FLWM";;
'fvwm') WM="FVWM";;
'gnome shell'*) WM="Mutter";;
'herbstluftwm') WM="herbstluftwm";;
'howm') WM="howm";;
'i3') WM="i3";;
'icewm') WM="IceWM";;
'kwin') WM="KWin";;
'metacity') WM="Metacity";;
'monsterwm') WM="monsterwm";;
'muffin') WM="Muffin";;
'musca') WM="Musca";;
'mutter'*) WM="Mutter";;
'mwm') WM="MWM";;
'notion') WM="Notion";;
'openbox') WM="OpenBox";;
'pekwm') WM="PekWM";;
'ratpoison') WM="Ratpoison";;
'sawfish') WM="Sawfish";;
'scrotwm') WM="ScrotWM";;
'spectrwm') WM="SpectrWM";;
'stumpwm') WM="StumpWM";;
'subtle') WM="subtle";;
'sway') WM="sway";;
'swm') WM="swm";;
'twin') WM="TWin";;
'wmaker') WM="WindowMaker";;
'wmfs') WM="WMFS";;
'wmii') WM="wmii";;
'xfwm4') WM="Xfwm4";;
'xmonad') WM="XMonad";;
esac
fi
elif [[ ${distro} == "Mac OS X" && "${WM}" == "Not Found" ]]; then
if ps -U ${USER} | grep Finder >/dev/null 2>&1; then