From bfac60758960b1ec52c0bc8f104c7eca00d1702a Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 29 Mar 2016 21:04:31 +1100 Subject: [PATCH 1/4] Use color function instead of harcoding escape sequences --- neofetch | 53 ++++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index 18a884bf..14c6292d 100755 --- a/neofetch +++ b/neofetch @@ -2311,54 +2311,49 @@ colors () { } setcolors () { - c1="\033[0m\033[3${1}m" - c2="\033[0m\033[3${2}m" - c3="\033[0m\033[3${3}m" - c4="\033[0m\033[3${4}m" - c5="\033[0m\033[3${5}m" - c6="\033[0m\033[3${6}m" - - # Fix for white on white - [ "$1" == 7 ] && c1="\033[0m" - [ "$2" == 7 ] && c2="\033[0m" - [ "$3" == 7 ] && c3="\033[0m" - [ "$4" == 7 ] && c4="\033[0m" - [ "$5" == 7 ] && c5="\033[0m" - [ "$6" == 7 ] && c6="\033[0m" + c1="$(color $1)" + c2="$(color $2)" + c3="$(color $3)" + c4="$(color $4)" + c5="$(color $5)" + c6="$(color $6)" if [ "${colors[0]}" == "distro" ]; then - title_color="\033[0m\033[3${1}m" + title_color="$c1" at_color="\033[0m" underline_color="\033[0m" - subtitle_color="\033[0m\033[3${2}m" + subtitle_color="$c2" colon_color="\033[0m" info_color="\033[0m" # If the second color is white use the first for the subtitle [ "$2" == 7 ] && subtitle_color="\033[0m\033[3${1}m" - [ "$1" == 7 ] && title_color="\033[0m" else - title_color="\033[0m\033[3${colors[0]}m" - at_color="\033[0m\033[3${colors[1]}m" - underline_color="\033[0m\033[3${colors[2]}m" - subtitle_color="\033[0m\033[3${colors[3]}m" - colon_color="\033[0m\033[3${colors[4]}m" - info_color="\033[0m\033[3${colors[5]}m" + title_color="$(color ${colors[0]})" + at_color="$(color ${colors[1]})" + underline_color="$(color ${colors[2]})" + subtitle_color="$(color ${colors[3]})" + colon_color="$(color ${colors[4]})" + info_color="$(color ${colors[5]})" fi [ "$progress_color_elapsed" == "distro" ] && \ - progress_color_elapsed="7" + progress_color_elapsed="$(color 7)" if [ "$progress_color_total" == "distro" ]; then - progress_color_total="$1" + progress_color_total="$c1" case "$1" in - 7 | 3 | 6) progress_color_total="${2}" ;; + 7 | 3 | 6) progress_color_total="$c2" ;; esac fi } color () { - printf "%b%s" "\033[0m\033[3${1}m" + if [ "$1" == 7 ]; then + printf "%b%s" "\033[0m" + else + printf "%b%s" "\033[0m\033[3${1}m" + fi } @@ -2466,8 +2461,8 @@ bar() { total=$(printf %"$((progress_length - elapsed))"s) # Set the colors and swap the spaces for $progress_char - bar="\033[0m\033[3${progress_color_elapsed}m${prog// /$progress_char}" - bar+="\033[0m\033[3${progress_color_total}m${total// /$progress_char}" + bar="${progress_color_elapsed}${prog// /$progress_char}" + bar+="${progress_color_total}${total// /$progress_char}" printf "%b%s\n" "${bar}${clear}" } From 9d20bb67cd7cae77568986564b689abe815a7660 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 29 Mar 2016 22:36:40 +1100 Subject: [PATCH 2/4] Fix progress bars --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 14c6292d..68d4e1e0 100755 --- a/neofetch +++ b/neofetch @@ -2461,8 +2461,8 @@ bar() { total=$(printf %"$((progress_length - elapsed))"s) # Set the colors and swap the spaces for $progress_char - bar="${progress_color_elapsed}${prog// /$progress_char}" - bar+="${progress_color_total}${total// /$progress_char}" + bar="\033[0m${progress_color_elapsed}${prog// /$progress_char}" + bar+="\033[0m${progress_color_total}${total// /$progress_char}" printf "%b%s\n" "${bar}${clear}" } From 1c715109fd79aca4e9b02ba933a75a4956ede763 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 29 Mar 2016 23:02:23 +1100 Subject: [PATCH 3/4] Fixed issues when progress colors weren't set to 'distro' --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 68d4e1e0..addddbb1 100755 --- a/neofetch +++ b/neofetch @@ -2337,14 +2337,19 @@ setcolors () { info_color="$(color ${colors[5]})" fi - [ "$progress_color_elapsed" == "distro" ] && \ + if [ "$progress_color_elapsed" == "distro" ]; then progress_color_elapsed="$(color 7)" + else + progress_color_elapsed="$(color $progress_color_elapsed)" + fi if [ "$progress_color_total" == "distro" ]; then progress_color_total="$c1" case "$1" in 7 | 3 | 6) progress_color_total="$c2" ;; esac + else + progress_color_total="$(color $progress_color_total)" fi } From a83062f1bbda0a13d994f862bdd85866a288bf59 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 29 Mar 2016 23:31:08 +1100 Subject: [PATCH 4/4] Tweaks --- neofetch | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index addddbb1..f0564503 100755 --- a/neofetch +++ b/neofetch @@ -435,8 +435,7 @@ config_file="$HOME/.config/neofetch/config" # Set no case match and extended globbing. -shopt -s nocasematch -shopt -s extglob +shopt -s nocasematch extglob # Operating System {{{ @@ -2343,14 +2342,11 @@ setcolors () { progress_color_elapsed="$(color $progress_color_elapsed)" fi - if [ "$progress_color_total" == "distro" ]; then - progress_color_total="$c1" - case "$1" in - 7 | 3 | 6) progress_color_total="$c2" ;; - esac - else - progress_color_total="$(color $progress_color_total)" - fi + case "$progress_color_total $1" in + distro\ [736]) progress_color_total="$c2" ;; + distro\ [0-9]) progress_color_total="$c1" ;; + *) progress_color_total="$(color $progress_color_total)" ;; + esac } color () { @@ -2466,8 +2462,8 @@ bar() { total=$(printf %"$((progress_length - elapsed))"s) # Set the colors and swap the spaces for $progress_char - bar="\033[0m${progress_color_elapsed}${prog// /$progress_char}" - bar+="\033[0m${progress_color_total}${total// /$progress_char}" + bar="${progress_color_elapsed}${prog// /$progress_char}" + bar+="${progress_color_total}${total// /$progress_char}" printf "%b%s\n" "${bar}${clear}" }