From a8ccdf6a654bee3228cf97eb4f01befc81e110dc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 15 Oct 2016 21:45:19 +1100 Subject: [PATCH 1/3] Uppercase first letter of info --- neofetch | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 4d321be9..7c8fde9c 100755 --- a/neofetch +++ b/neofetch @@ -539,7 +539,7 @@ getwm() { case "$wm" in "xwlc") wm="$(ps -e | grep -m 1 -oE "sway|orbment|velox|orbital")" - [ "$version" -ge 4 ] && wm="${wm^}" + wm="$(uppercase "$wm")" ;; esac @@ -663,7 +663,7 @@ getwmtheme() { esac wmtheme="${wmtheme//\'}" - [ "$version" -ge 4 ] && wmtheme="${wmtheme^}" + wmtheme="$(uppercase "$wmtheme")" } # }}} @@ -1396,7 +1396,7 @@ getstyle() { theme="$(grep "^[^#]*$kde" "$kde_config_file")" theme="${theme/${kde}*=}" - [ "$version" -ge 4 ] && theme="${theme^}" + theme="$(uppercase "$theme")" gtk_shorthand="on" return @@ -1471,10 +1471,8 @@ getstyle() { gtk3theme=${gtk3theme//\'} # Uppercase the first letter of each gtk theme - if [ "$version" -ge 4 ]; then - gtk2theme="${gtk2theme^}" - gtk3theme="${gtk3theme^}" - fi + gtk2theme="$(uppercase "$gtk2theme")" + gtk3theme="$(uppercase "$gtk3theme")" # Toggle visibility of gtk themes. [ "$gtk2" == "off" ] && unset gtk2theme @@ -1559,6 +1557,8 @@ getterm() { "gnome-terminal-") term="gnome-terminal" ;; *) term="$name" ;; esac + + term="$(uppercase "$term")" } # }}} @@ -1607,6 +1607,8 @@ gettermfont() { termfont="${termfont/:*}" ;; esac + + termfont="$(uppercase "$termfont")" } # }}} @@ -2663,6 +2665,15 @@ bold() { # }}} +# Uppercase {{{ + +# Uppercase the first letter of $1 +uppercase () { + [ "$version" -ge 4 ] && printf "%s" "${1^}" +} + +# }}} + # Linebreak {{{ getlinebreak() { From 30d808c52d9730f0a211ac096b9dcda54aba8672 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 15 Oct 2016 22:01:15 +1100 Subject: [PATCH 2/3] Fix function in bash 3 --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7c8fde9c..f459b363 100755 --- a/neofetch +++ b/neofetch @@ -2669,7 +2669,11 @@ bold() { # Uppercase the first letter of $1 uppercase () { - [ "$version" -ge 4 ] && printf "%s" "${1^}" + if [ "$version" -ge 4 ]; then + printf "%s" "${1^}" + else + printf "%s" "${1}" + fi } # }}} From 5e167e4c022c96237880ed7c8c9d737eff372ee8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 15 Oct 2016 22:07:12 +1100 Subject: [PATCH 3/3] Uppercase without function --- neofetch | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index f459b363..6e66260e 100755 --- a/neofetch +++ b/neofetch @@ -539,7 +539,7 @@ getwm() { case "$wm" in "xwlc") wm="$(ps -e | grep -m 1 -oE "sway|orbment|velox|orbital")" - wm="$(uppercase "$wm")" + [ "$version" -ge 4 ] && wm="${wm^}" ;; esac @@ -663,7 +663,7 @@ getwmtheme() { esac wmtheme="${wmtheme//\'}" - wmtheme="$(uppercase "$wmtheme")" + [ "$version" -ge 4 ] && wmtheme="${wmtheme^}" } # }}} @@ -1396,7 +1396,7 @@ getstyle() { theme="$(grep "^[^#]*$kde" "$kde_config_file")" theme="${theme/${kde}*=}" - theme="$(uppercase "$theme")" + [ "$version" -ge 4 ] && theme="${theme^}" gtk_shorthand="on" return @@ -1471,8 +1471,10 @@ getstyle() { gtk3theme=${gtk3theme//\'} # Uppercase the first letter of each gtk theme - gtk2theme="$(uppercase "$gtk2theme")" - gtk3theme="$(uppercase "$gtk3theme")" + if [ "$version" -ge 4 ]; then + gtk2theme="${gtk2theme^}" + gtk3theme="${gtk3theme^}" + fi # Toggle visibility of gtk themes. [ "$gtk2" == "off" ] && unset gtk2theme @@ -1558,7 +1560,7 @@ getterm() { *) term="$name" ;; esac - term="$(uppercase "$term")" + [ "$version" -ge 4 ] && term="${term^}" } # }}} @@ -1608,7 +1610,7 @@ gettermfont() { ;; esac - termfont="$(uppercase "$termfont")" + [ "$version" -ge 4 ] && termfont="${termfont^}" } # }}} @@ -2665,19 +2667,6 @@ bold() { # }}} -# Uppercase {{{ - -# Uppercase the first letter of $1 -uppercase () { - if [ "$version" -ge 4 ]; then - printf "%s" "${1^}" - else - printf "%s" "${1}" - fi -} - -# }}} - # Linebreak {{{ getlinebreak() {