From 4c54da56b73aa1a83a39cb20410f70e4c463de89 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 14:53:31 +1100 Subject: [PATCH] Move windows theme to wmtheme --- neofetch | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index ff7f7500..64679fcf 100755 --- a/neofetch +++ b/neofetch @@ -894,6 +894,16 @@ getwmtheme () { fi ;; + 'Explorer') + path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" + path+="/Windows/CurrentVersion/Themes/CurrentTheme" + + wmtheme="$(head -n1 "$path" 2>/dev/null)" + wmtheme="${wmtheme##*\\}" + wmtheme="${wmtheme%.*}" + wmtheme="${wmtheme^}" + ;; + esac wmtheme="${wmtheme//\'}" @@ -1377,8 +1387,6 @@ getstyle () { gconf="gtk_theme" xfconf="ThemeName" kde="widgetStyle" - path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" - path+="/Windows/CurrentVersion/Themes/CurrentTheme" ;; icons) @@ -1517,17 +1525,6 @@ getstyle () { theme=${theme/ '[GTK3]'} theme=${theme/ '[GTK2/3]'} fi - else - case "$os" in - "Windows") - [ -z "$path" ] && return - theme="$(head -n1 "$path" 2>/dev/null)" - theme="${theme##*\\}" - theme="${theme%.*}" - theme="${theme^}" - ;; - - esac fi }