jinql
/
bashtop
mirror of https://github.com/aristocratos/bashtop
1
0
Fork 0
Code Issues Releases Wiki Activity

v0.8.32 Fix for corrupted default theme

pull/122/head v0.8.32
aristocratos 2020-05-21 11:35:39 +02:00
parent ff9012ab36
commit 98d2f84894
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## v0.8.32
* Fixed: Error in theme error checking corrupting default theme
## v0.8.31 ## v0.8.31
* Fixed: Theme 2-color gradient generation * Fixed: Theme 2-color gradient generation

6
bashtop
View File

@ -66,7 +66,7 @@ banner=(
"██╔══██╗██╔══██║╚════██║██╔══██║ ██║ ██║ ██║██╔═══╝ " "██╔══██╗██╔══██║╚════██║██╔══██║ ██║ ██║ ██║██╔═══╝ "
"██████╔╝██║ ██║███████║██║ ██║ ██║ ╚██████╔╝██║ " "██████╔╝██║ ██║███████║██║ ██║ ██║ ╚██████╔╝██║ "
"╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ") "╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ")
declare version="0.8.31" declare version="0.8.32"
#* Get latest version of BashTOP from https://github.com/aristocratos/bashtop #* Get latest version of BashTOP from https://github.com/aristocratos/bashtop
@ -432,8 +432,8 @@ color_init_() { #? Check for theme file and set colors
if [[ -n ${theme[main_bg]} ]]; then theme[main_bg_dec]="${theme[main_bg]}"; theme[main_bg]=";48;2;${theme[main_bg]// /;}"; fi if [[ -n ${theme[main_bg]} ]]; then theme[main_bg_dec]="${theme[main_bg]}"; theme[main_bg]=";48;2;${theme[main_bg]// /;}"; fi
#* Set colors from theme file if found and valid hexadecimal or integers, otherwise use default values #* Set colors from theme file if found and valid hexadecimal or integers, otherwise use default values
for color_name in ${set_color[@]}; do for color_name in "${set_color[@]}"; do
if ! is_hex ${theme[$color_name]} && ! is_int ${theme[$color_name]}; then theme[${color_name}]="${!color_name}"; fi if [[ -z ${theme[$color_name]} ]] || ! is_hex "${theme[$color_name]}" && ! is_int "${theme[$color_name]}"; then theme[${color_name}]="${!color_name}"; fi
done done
box[cpu_color]="${theme[cpu_box]}" box[cpu_color]="${theme[cpu_box]}"