Merge branch 'master' of github.com:dylanaraps/neofetch
This commit is contained in:
commit
22735a7423
2 changed files with 20 additions and 6 deletions
|
@ -257,9 +257,11 @@ progress_char="━"
|
||||||
progress_length="15"
|
progress_length="15"
|
||||||
|
|
||||||
# Progress bar colors
|
# Progress bar colors
|
||||||
|
# When set to distro, uses your distro's logo colors
|
||||||
|
# Takes: num, "distro"
|
||||||
# --progress_colors col col
|
# --progress_colors col col
|
||||||
progress_color_elapsed="6"
|
progress_color_elapsed="distro"
|
||||||
progress_color_total="8"
|
progress_color_total="distro"
|
||||||
|
|
||||||
# Customize how the info is displayed.
|
# Customize how the info is displayed.
|
||||||
# bar: Only the progress bar is displayed.
|
# bar: Only the progress bar is displayed.
|
||||||
|
|
20
neofetch
20
neofetch
|
@ -279,9 +279,11 @@ progress_char="━"
|
||||||
progress_length="15"
|
progress_length="15"
|
||||||
|
|
||||||
# Progress bar colors
|
# Progress bar colors
|
||||||
|
# When set to distro, uses your distro's logo colors
|
||||||
|
# Takes: num, "distro"
|
||||||
# --progress_colors col col
|
# --progress_colors col col
|
||||||
progress_color_elapsed="6"
|
progress_color_elapsed="distro"
|
||||||
progress_color_total="8"
|
progress_color_total="distro"
|
||||||
|
|
||||||
# Customize how the info is displayed.
|
# Customize how the info is displayed.
|
||||||
# bar: Only the progress bar is displayed.
|
# bar: Only the progress bar is displayed.
|
||||||
|
@ -2341,6 +2343,16 @@ setcolors () {
|
||||||
colon_color="\033[3${colors[4]}m"
|
colon_color="\033[3${colors[4]}m"
|
||||||
info_color="\033[3${colors[5]}m"
|
info_color="\033[3${colors[5]}m"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
[ "$progress_color_elapsed" == "distro" ] && \
|
||||||
|
progress_color_elapsed="7"
|
||||||
|
|
||||||
|
if [ "$progress_color_total" == "distro" ]; then
|
||||||
|
progress_color_total="$1"
|
||||||
|
case "$1" in
|
||||||
|
7 | 3 | 6) progress_color_total="${2}" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
color () {
|
color () {
|
||||||
|
@ -2452,8 +2464,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[38;5;${progress_color_elapsed}m${prog// /$progress_char}"
|
bar="\033[3${progress_color_elapsed}m${prog// /$progress_char}"
|
||||||
bar+="\033[38;5;${progress_color_total}m${total// /$progress_char}"
|
bar+="\033[3${progress_color_total}m${total// /$progress_char}"
|
||||||
printf "%b%s\n" "${bar}${clear}"
|
printf "%b%s\n" "${bar}${clear}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue