Merge branch 'master' of git.silverirc.com:screenfetch

This commit is contained in:
Brett Bohnenkamper
2013-03-29 19:42:20 -05:00

View File

@@ -972,6 +972,8 @@ detectwm () {
WM=$(xprop -root _NET_SUPPORTING_WM_CHECK)
if [[ "$WM" =~ "not found" ]]; then
WM="Not Found"
elif [[ "$WM" =~ "invalid window id format" ]]; then
WM="Not Found"
else
WM=${WM//* }
WM=$(xprop -id ${WM} 8s _NET_WM_NAME)
@@ -1073,7 +1075,7 @@ detectwm () {
detectwmtheme () {
Win_theme="Not Found"
case $WM in
'Awesome') if [ -f ${XDG_CONFIG_HOME:-${HOME}/.config}/awesome/rc.lua ]; then Win_theme="$(grep -e '^[^-].*\(theme\|beautiful\).*lua' ${XDG_CONFIG_HOME:-${HOME}/.config}/awesome/rc.lua | grep '[a-zA-Z0-9]\+/[a-zA-Z0-9]\+.lua' -o | cut -d'/' -f1)"; fi;;
'Awesome') if [ -f ${XDG_CONFIG_HOME:-${HOME}/.config}/awesome/rc.lua ]; then Win_theme="$(grep -e '^[^-].*\(theme\|beautiful\).*lua' ${XDG_CONFIG_HOME:-${HOME}/.config}/awesome/rc.lua | grep '[a-zA-Z0-9]\+/[a-zA-Z0-9]\+.lua' -o | cut -d'/' -f1 | head -n1)"; fi;;
'BlackBox') if [ -f $HOME/.blackboxrc ]; then Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' $HOME/.blackboxrc)"; fi;;
'Beryl') Win_theme="Not Present";;
'Cinnamon') Win_theme="$(gsettings get org.cinnamon.theme name)";;