This commit is contained in:
Dylan 2016-03-29 23:31:08 +11:00
parent 1c715109fd
commit a83062f1bb

View file

@ -435,8 +435,7 @@ config_file="$HOME/.config/neofetch/config"
# Set no case match and extended globbing. # Set no case match and extended globbing.
shopt -s nocasematch shopt -s nocasematch extglob
shopt -s extglob
# Operating System {{{ # Operating System {{{
@ -2343,14 +2342,11 @@ setcolors () {
progress_color_elapsed="$(color $progress_color_elapsed)" progress_color_elapsed="$(color $progress_color_elapsed)"
fi fi
if [ "$progress_color_total" == "distro" ]; then case "$progress_color_total $1" in
progress_color_total="$c1" distro\ [736]) progress_color_total="$c2" ;;
case "$1" in distro\ [0-9]) progress_color_total="$c1" ;;
7 | 3 | 6) progress_color_total="$c2" ;; *) progress_color_total="$(color $progress_color_total)" ;;
esac esac
else
progress_color_total="$(color $progress_color_total)"
fi
} }
color () { color () {
@ -2466,8 +2462,8 @@ bar() {
total=$(printf %"$((progress_length - elapsed))"s) total=$(printf %"$((progress_length - elapsed))"s)
# Set the colors and swap the spaces for $progress_char # Set the colors and swap the spaces for $progress_char
bar="\033[0m${progress_color_elapsed}${prog// /$progress_char}" bar="${progress_color_elapsed}${prog// /$progress_char}"
bar+="\033[0m${progress_color_total}${total// /$progress_char}" bar+="${progress_color_total}${total// /$progress_char}"
printf "%b%s\n" "${bar}${clear}" printf "%b%s\n" "${bar}${clear}"
} }