diff --git a/scripts/cpu_bg_color.sh b/scripts/cpu_bg_color.sh index e96e0e3..e072405 100755 --- a/scripts/cpu_bg_color.sh +++ b/scripts/cpu_bg_color.sh @@ -23,7 +23,7 @@ print_bg_color() { local cpu_percentage local load_status cpu_percentage=$("$CURRENT_DIR"/cpu_percentage.sh | sed -e 's/%//') - load_status=$(load_status "$cpu_percentage") + load_status=$(load_status "$cpu_percentage" "cpu") if [ "$load_status" == "low" ]; then echo "$cpu_low_bg_color" elif [ "$load_status" == "medium" ]; then diff --git a/scripts/cpu_fg_color.sh b/scripts/cpu_fg_color.sh index 9e92fde..3afb80e 100755 --- a/scripts/cpu_fg_color.sh +++ b/scripts/cpu_fg_color.sh @@ -23,7 +23,7 @@ print_fg_color() { local cpu_percentage local load_status cpu_percentage=$("$CURRENT_DIR"/cpu_percentage.sh | sed -e 's/%//') - load_status=$(load_status "$cpu_percentage") + load_status=$(load_status "$cpu_percentage" "cpu") if [ "$load_status" == "low" ]; then echo "$cpu_low_fg_color" elif [ "$load_status" == "medium" ]; then diff --git a/scripts/cpu_icon.sh b/scripts/cpu_icon.sh index cba6e05..99b9272 100755 --- a/scripts/cpu_icon.sh +++ b/scripts/cpu_icon.sh @@ -25,7 +25,7 @@ print_icon() { local cpu_percentage local load_status cpu_percentage=$("$CURRENT_DIR"/cpu_percentage.sh | sed -e 's/%//') - load_status=$(load_status "$cpu_percentage") + load_status=$(load_status "$cpu_percentage" "cpu") if [ "$load_status" == "low" ]; then echo "$cpu_low_icon" elif [ "$load_status" == "medium" ]; then diff --git a/scripts/gpu_bg_color.sh b/scripts/gpu_bg_color.sh index 886df61..9b978fc 100755 --- a/scripts/gpu_bg_color.sh +++ b/scripts/gpu_bg_color.sh @@ -23,7 +23,7 @@ print_bg_color() { local gpu_percentage local gpu_load_status gpu_percentage=$("$CURRENT_DIR"/gpu_percentage.sh | sed -e 's/%//') - gpu_load_status=$(load_status "$gpu_percentage") + gpu_load_status=$(load_status "$gpu_percentage" "gpu") if [ "$gpu_load_status" == "low" ]; then echo "$gpu_low_bg_color" elif [ "$gpu_load_status" == "medium" ]; then diff --git a/scripts/gpu_fg_color.sh b/scripts/gpu_fg_color.sh index f652619..aa02cf6 100755 --- a/scripts/gpu_fg_color.sh +++ b/scripts/gpu_fg_color.sh @@ -23,7 +23,7 @@ print_fg_color() { local gpu_percentage local gpu_load_status gpu_percentage=$("$CURRENT_DIR"/gpu_percentage.sh | sed -e 's/%//') - gpu_load_status=$(load_status "$gpu_percentage") + gpu_load_status=$(load_status "$gpu_percentage" "gpu") if [ "$gpu_load_status" == "low" ]; then echo "$gpu_low_fg_color" elif [ "$gpu_load_status" == "medium" ]; then diff --git a/scripts/gpu_icon.sh b/scripts/gpu_icon.sh index 7212737..0bb52f4 100755 --- a/scripts/gpu_icon.sh +++ b/scripts/gpu_icon.sh @@ -25,7 +25,7 @@ print_icon() { local gpu_percentage local gpu_load_status gpu_percentage=$("$CURRENT_DIR"/gpu_percentage.sh | sed -e 's/%//') - gpu_load_status=$(load_status "$gpu_percentage") + gpu_load_status=$(load_status "$gpu_percentage" "gpu") if [ "$gpu_load_status" == "low" ]; then echo "$gpu_low_icon" elif [ "$gpu_load_status" == "medium" ]; then diff --git a/scripts/gram_bg_color.sh b/scripts/gram_bg_color.sh index 25223de..e8d95e6 100755 --- a/scripts/gram_bg_color.sh +++ b/scripts/gram_bg_color.sh @@ -23,7 +23,7 @@ print_bg_color() { local gram_percentage local gram_load_status gram_percentage=$("$CURRENT_DIR"/gram_percentage.sh | sed -e 's/%//') - gram_load_status=$(load_status "$gram_percentage") + gram_load_status=$(load_status "$gram_percentage" "gram") if [ "$gram_load_status" == "low" ]; then echo "$gram_low_bg_color" elif [ "$gram_load_status" == "medium" ]; then diff --git a/scripts/gram_fg_color.sh b/scripts/gram_fg_color.sh index 6ceb96f..4f4d155 100755 --- a/scripts/gram_fg_color.sh +++ b/scripts/gram_fg_color.sh @@ -23,7 +23,7 @@ print_fg_color() { local gram_percentage local gram_load_status gram_percentage=$("$CURRENT_DIR"/gram_percentage.sh | sed -e 's/%//') - gram_load_status=$(load_status "$gram_percentage") + gram_load_status=$(load_status "$gram_percentage" "gram") if [ "$gram_load_status" == "low" ]; then echo "$gram_low_fg_color" elif [ "$gram_load_status" == "medium" ]; then diff --git a/scripts/gram_icon.sh b/scripts/gram_icon.sh index eb8a998..04eb694 100755 --- a/scripts/gram_icon.sh +++ b/scripts/gram_icon.sh @@ -25,7 +25,7 @@ print_icon() { local gram_percentage local gram_load_status gram_percentage=$("$CURRENT_DIR"/gram_percentage.sh | sed -e 's/%//') - gram_load_status=$(load_status "$gram_percentage") + gram_load_status=$(load_status "$gram_percentage" "gram") if [ "$gram_load_status" == "low" ]; then echo "$gram_low_icon" elif [ "$gram_load_status" == "medium" ]; then diff --git a/scripts/helpers.sh b/scripts/helpers.sh index 8cb02d0..6d72c46 100644 --- a/scripts/helpers.sh +++ b/scripts/helpers.sh @@ -52,11 +52,12 @@ fcomp() { load_status() { local percentage=$1 - cpu_medium_thresh=$(get_tmux_option "@cpu_medium_thresh" "30") - cpu_high_thresh=$(get_tmux_option "@cpu_high_thresh" "80") - if fcomp "$cpu_high_thresh" "$percentage"; then + local prefix=$2 + medium_thresh=$(get_tmux_option "@${prefix}_medium_thresh" "30") + high_thresh=$(get_tmux_option "@${prefix}_high_thresh" "80") + if fcomp "$high_thresh" "$percentage"; then echo "high" - elif fcomp "$cpu_medium_thresh" "$percentage" && fcomp "$percentage" "$cpu_high_thresh"; then + elif fcomp "$medium_thresh" "$percentage" && fcomp "$percentage" "$high_thresh"; then echo "medium" else echo "low" diff --git a/scripts/ram_bg_color.sh b/scripts/ram_bg_color.sh index 880b70b..57ae7e7 100755 --- a/scripts/ram_bg_color.sh +++ b/scripts/ram_bg_color.sh @@ -23,7 +23,7 @@ print_bg_color() { local ram_percentage local ram_load_status ram_percentage=$("$CURRENT_DIR"/ram_percentage.sh | sed -e 's/%//') - ram_load_status=$(load_status "$ram_percentage") + ram_load_status=$(load_status "$ram_percentage" "ram") if [ "$ram_load_status" == "low" ]; then echo "$ram_low_bg_color" elif [ "$ram_load_status" == "medium" ]; then diff --git a/scripts/ram_fg_color.sh b/scripts/ram_fg_color.sh index c68a924..9d5a172 100755 --- a/scripts/ram_fg_color.sh +++ b/scripts/ram_fg_color.sh @@ -23,7 +23,7 @@ print_fg_color() { local ram_percentage local ram_load_status ram_percentage=$("$CURRENT_DIR"/ram_percentage.sh | sed -e 's/%//') - ram_load_status=$(load_status "$ram_percentage") + ram_load_status=$(load_status "$ram_percentage" "ram") if [ "$ram_load_status" == "low" ]; then echo "$ram_low_fg_color" elif [ "$ram_load_status" == "medium" ]; then diff --git a/scripts/ram_icon.sh b/scripts/ram_icon.sh index c411a6d..5ad253b 100755 --- a/scripts/ram_icon.sh +++ b/scripts/ram_icon.sh @@ -25,7 +25,7 @@ print_icon() { local ram_percentage local ram_load_status ram_percentage=$("$CURRENT_DIR"/ram_percentage.sh | sed -e 's/%//') - ram_load_status=$(load_status "$ram_percentage") + ram_load_status=$(load_status "$ram_percentage" "ram") if [ "$ram_load_status" == "low" ]; then echo "$ram_low_icon" elif [ "$ram_load_status" == "medium" ]; then