misc: cleanup

This commit is contained in:
Dylan Araps 2018-06-05 06:45:11 +10:00
parent 62aca46151
commit 552523edbf

View file

@ -2291,7 +2291,7 @@ get_memory() {
# Bars. # Bars.
case "$memory_display" in case "$memory_display" in
"bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;;
"infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;; "infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;;
"barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;; "barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;;
esac esac
@ -3125,10 +3125,10 @@ get_disk() {
# Bar. # Bar.
case "$disk_display" in case "$disk_display" in
"bar") disk="$(bar "$disk_perc" "100")" ;; "bar") disk="$(bar "$disk_perc" "100")" ;;
"infobar") disk+=" $(bar "$disk_perc" "100")" ;; "infobar") disk+=" $(bar "$disk_perc" "100")" ;;
"barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;;
"perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;;
esac esac
# Append '(disk mount point)' to the subtitle. # Append '(disk mount point)' to the subtitle.
@ -3153,7 +3153,7 @@ get_battery() {
battery="${capacity}% [${status}]" battery="${capacity}% [${status}]"
case "$battery_display" in case "$battery_display" in
"bar") battery="$(bar "$capacity" 100)" ;; "bar") battery="$(bar "$capacity" 100)" ;;
"infobar") battery+=" $(bar "$capacity" 100)" ;; "infobar") battery+=" $(bar "$capacity" 100)" ;;
"barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;; "barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;;
esac esac
@ -3212,7 +3212,7 @@ get_battery() {
[[ "$battery_state" ]] && battery+=" Charging" [[ "$battery_state" ]] && battery+=" Charging"
case "$battery_display" in case "$battery_display" in
"bar") battery="$(bar "${battery/'%'*}" 100)" ;; "bar") battery="$(bar "${battery/'%'*}" 100)" ;;
"infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;; "infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;;
"barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;; "barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;;
esac esac
@ -4359,8 +4359,6 @@ ASCII:
--ascii_bold on/off Whether or not to bold the ascii logo. --ascii_bold on/off Whether or not to bold the ascii logo.
-L, --logo Hide the info text and only show the ascii logo. -L, --logo Hide the info text and only show the ascii logo.
Possible values: bar, infobar, barinfo, off
IMAGE: IMAGE:
--loop Redraw the image constantly until Ctrl+C is used. This fixes issues --loop Redraw the image constantly until Ctrl+C is used. This fixes issues
in some terminals emulators when using image mode. in some terminals emulators when using image mode.