From 5aa3b34a62f718e79aea19c6b6d442dad94a9e43 Mon Sep 17 00:00:00 2001 From: Camille TJHOA Date: Fri, 11 Oct 2019 09:15:38 +0000 Subject: [PATCH] Add editorconfig --- .editorconfig | 16 ++++++++++ cpu.tmux | 60 ++++++++++++++++++------------------- scripts/cpu_bg_color.sh | 28 +++++++++--------- scripts/cpu_fg_color.sh | 28 +++++++++--------- scripts/cpu_icon.sh | 30 +++++++++---------- scripts/cpu_percentage.sh | 47 ++++++++++++++--------------- scripts/gpu_bg_color.sh | 28 +++++++++--------- scripts/gpu_fg_color.sh | 28 +++++++++--------- scripts/gpu_icon.sh | 30 +++++++++---------- scripts/gpu_percentage.sh | 26 ++++++++-------- scripts/helpers.sh | 62 +++++++++++++++++++-------------------- 11 files changed, 200 insertions(+), 183 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..94dcf5a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true + +# 2 space indentation +[*.{sh,tmux}] +indent_style = space +indent_size = 2 diff --git a/cpu.tmux b/cpu.tmux index d39b42d..cbc87b5 100755 --- a/cpu.tmux +++ b/cpu.tmux @@ -5,49 +5,49 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$CURRENT_DIR/scripts/helpers.sh" cpu_interpolation=( - "\#{cpu_percentage}" - "\#{cpu_icon}" - "\#{cpu_bg_color}" - "\#{cpu_fg_color}" - "\#{gpu_percentage}" - "\#{gpu_icon}" - "\#{gpu_bg_color}" - "\#{gpu_fg_color}" + "\#{cpu_percentage}" + "\#{cpu_icon}" + "\#{cpu_bg_color}" + "\#{cpu_fg_color}" + "\#{gpu_percentage}" + "\#{gpu_icon}" + "\#{gpu_bg_color}" + "\#{gpu_fg_color}" ) cpu_commands=( - "#($CURRENT_DIR/scripts/cpu_percentage.sh)" - "#($CURRENT_DIR/scripts/cpu_icon.sh)" - "#($CURRENT_DIR/scripts/cpu_bg_color.sh)" - "#($CURRENT_DIR/scripts/cpu_fg_color.sh)" - "#($CURRENT_DIR/scripts/gpu_percentage.sh)" - "#($CURRENT_DIR/scripts/gpu_icon.sh)" - "#($CURRENT_DIR/scripts/gpu_bg_color.sh)" - "#($CURRENT_DIR/scripts/gpu_fg_color.sh)" + "#($CURRENT_DIR/scripts/cpu_percentage.sh)" + "#($CURRENT_DIR/scripts/cpu_icon.sh)" + "#($CURRENT_DIR/scripts/cpu_bg_color.sh)" + "#($CURRENT_DIR/scripts/cpu_fg_color.sh)" + "#($CURRENT_DIR/scripts/gpu_percentage.sh)" + "#($CURRENT_DIR/scripts/gpu_icon.sh)" + "#($CURRENT_DIR/scripts/gpu_bg_color.sh)" + "#($CURRENT_DIR/scripts/gpu_fg_color.sh)" ) set_tmux_option() { - local option=$1 - local value=$2 - tmux set-option -gq "$option" "$value" + local option=$1 + local value=$2 + tmux set-option -gq "$option" "$value" } do_interpolation() { - local all_interpolated="$1" - for ((i=0; i<${#cpu_commands[@]}; i++)); do - all_interpolated=${all_interpolated/${cpu_interpolation[$i]}/${cpu_commands[$i]}} - done - echo "$all_interpolated" + local all_interpolated="$1" + for ((i=0; i<${#cpu_commands[@]}; i++)); do + all_interpolated=${all_interpolated/${cpu_interpolation[$i]}/${cpu_commands[$i]}} + done + echo "$all_interpolated" } update_tmux_option() { - local option=$1 - local option_value=$(get_tmux_option "$option") - local new_option_value=$(do_interpolation "$option_value") - set_tmux_option "$option" "$new_option_value" + local option=$1 + local option_value=$(get_tmux_option "$option") + local new_option_value=$(do_interpolation "$option_value") + set_tmux_option "$option" "$new_option_value" } main() { - update_tmux_option "status-right" - update_tmux_option "status-left" + update_tmux_option "status-right" + update_tmux_option "status-left" } main diff --git a/scripts/cpu_bg_color.sh b/scripts/cpu_bg_color.sh index 17c9166..5e6e553 100755 --- a/scripts/cpu_bg_color.sh +++ b/scripts/cpu_bg_color.sh @@ -13,25 +13,25 @@ cpu_medium_default_bg_color="#[bg=yellow]" cpu_high_default_bg_color="#[bg=red]" get_bg_color_settings() { - cpu_low_bg_color=$(get_tmux_option "@cpu_low_bg_color" "$cpu_low_default_bg_color") - cpu_medium_bg_color=$(get_tmux_option "@cpu_medium_bg_color" "$cpu_medium_default_bg_color") - cpu_high_bg_color=$(get_tmux_option "@cpu_high_bg_color" "$cpu_high_default_bg_color") + cpu_low_bg_color=$(get_tmux_option "@cpu_low_bg_color" "$cpu_low_default_bg_color") + cpu_medium_bg_color=$(get_tmux_option "@cpu_medium_bg_color" "$cpu_medium_default_bg_color") + cpu_high_bg_color=$(get_tmux_option "@cpu_high_bg_color" "$cpu_high_default_bg_color") } print_bg_color() { - local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') - local cpu_load_status=$(cpu_load_status $cpu_percentage) - if [ $cpu_load_status == "low" ]; then - echo "$cpu_low_bg_color" - elif [ $cpu_load_status == "medium" ]; then - echo "$cpu_medium_bg_color" - elif [ $cpu_load_status == "high" ]; then - echo "$cpu_high_bg_color" - fi + local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') + local cpu_load_status=$(cpu_load_status $cpu_percentage) + if [ $cpu_load_status == "low" ]; then + echo "$cpu_low_bg_color" + elif [ $cpu_load_status == "medium" ]; then + echo "$cpu_medium_bg_color" + elif [ $cpu_load_status == "high" ]; then + echo "$cpu_high_bg_color" + fi } main() { - get_bg_color_settings - print_bg_color + get_bg_color_settings + print_bg_color } main diff --git a/scripts/cpu_fg_color.sh b/scripts/cpu_fg_color.sh index f3e3406..2db2590 100755 --- a/scripts/cpu_fg_color.sh +++ b/scripts/cpu_fg_color.sh @@ -13,25 +13,25 @@ cpu_medium_default_fg_color="#[fg=yellow]" cpu_high_default_fg_color="#[fg=red]" get_fg_color_settings() { - cpu_low_fg_color=$(get_tmux_option "@cpu_low_fg_color" "$cpu_low_default_fg_color") - cpu_medium_fg_color=$(get_tmux_option "@cpu_medium_fg_color" "$cpu_medium_default_fg_color") - cpu_high_fg_color=$(get_tmux_option "@cpu_high_fg_color" "$cpu_high_default_fg_color") + cpu_low_fg_color=$(get_tmux_option "@cpu_low_fg_color" "$cpu_low_default_fg_color") + cpu_medium_fg_color=$(get_tmux_option "@cpu_medium_fg_color" "$cpu_medium_default_fg_color") + cpu_high_fg_color=$(get_tmux_option "@cpu_high_fg_color" "$cpu_high_default_fg_color") } print_fg_color() { - local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') - local cpu_load_status=$(cpu_load_status $cpu_percentage) - if [ $cpu_load_status == "low" ]; then - echo "$cpu_low_fg_color" - elif [ $cpu_load_status == "medium" ]; then - echo "$cpu_medium_fg_color" - elif [ $cpu_load_status == "high" ]; then - echo "$cpu_high_fg_color" - fi + local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') + local cpu_load_status=$(cpu_load_status $cpu_percentage) + if [ $cpu_load_status == "low" ]; then + echo "$cpu_low_fg_color" + elif [ $cpu_load_status == "medium" ]; then + echo "$cpu_medium_fg_color" + elif [ $cpu_load_status == "high" ]; then + echo "$cpu_high_fg_color" + fi } main() { - get_fg_color_settings - print_fg_color + get_fg_color_settings + print_fg_color } main diff --git a/scripts/cpu_icon.sh b/scripts/cpu_icon.sh index cef9c32..87a0004 100755 --- a/scripts/cpu_icon.sh +++ b/scripts/cpu_icon.sh @@ -15,26 +15,26 @@ cpu_high_default_icon="≣" # icons are set as script global variables get_icon_settings() { - cpu_low_icon=$(get_tmux_option "@cpu_low_icon" "$cpu_low_default_icon") - cpu_medium_icon=$(get_tmux_option "@cpu_medium_icon" "$cpu_medium_default_icon") - cpu_high_icon=$(get_tmux_option "@cpu_high_icon" "$cpu_high_default_icon") + cpu_low_icon=$(get_tmux_option "@cpu_low_icon" "$cpu_low_default_icon") + cpu_medium_icon=$(get_tmux_option "@cpu_medium_icon" "$cpu_medium_default_icon") + cpu_high_icon=$(get_tmux_option "@cpu_high_icon" "$cpu_high_default_icon") } print_icon() { - local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') - local cpu_load_status=$(cpu_load_status $cpu_percentage) - if [ $cpu_load_status == "low" ]; then - echo "$cpu_low_icon" - elif [ $cpu_load_status == "medium" ]; then - echo "$cpu_medium_icon" - elif [ $cpu_load_status == "high" ]; then - echo "$cpu_high_icon" - fi + local cpu_percentage=$($CURRENT_DIR/cpu_percentage.sh | sed -e 's/%//') + local cpu_load_status=$(cpu_load_status $cpu_percentage) + if [ $cpu_load_status == "low" ]; then + echo "$cpu_low_icon" + elif [ $cpu_load_status == "medium" ]; then + echo "$cpu_medium_icon" + elif [ $cpu_load_status == "high" ]; then + echo "$cpu_high_icon" + fi } main() { - get_icon_settings - local cpu_icon=$(print_icon "$1") - echo "$cpu_icon" + get_icon_settings + local cpu_icon=$(print_icon "$1") + echo "$cpu_icon" } main diff --git a/scripts/cpu_percentage.sh b/scripts/cpu_percentage.sh index dfa01b4..f1e34af 100755 --- a/scripts/cpu_percentage.sh +++ b/scripts/cpu_percentage.sh @@ -5,32 +5,33 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$CURRENT_DIR/helpers.sh" print_cpu_percentage() { - if command_exists "iostat"; then - if is_linux_iostat; then - iostat -c 1 2 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' - elif is_osx; then - iostat -c 2 disk0 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$6} END {printf("%3.1f%%", usage)}' | sed 's/,/./' - elif is_freebsd || is_openbsd; then - iostat -c 2 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' - else - echo "Unknown iostat version please create an issue" - fi - elif command_exists "sar"; then - sar -u 1 1 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' - else - if is_cygwin; then - usage="$(WMIC cpu get LoadPercentage | grep -Eo '^[0-9]+')" - printf "%3.1f%%" $usage - else - load=`ps -aux | awk '{print $3}' | tail -n+2 | awk '{s+=$1} END {print s}'` - cpus=$(cpus_number) - echo "$load $cpus" | awk '{printf "%3.1f%%", $1/$2}' - fi - fi + if command_exists "iostat"; then + + if is_linux_iostat; then + iostat -c 1 2 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' + elif is_osx; then + iostat -c 2 disk0 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$6} END {printf("%3.1f%%", usage)}' | sed 's/,/./' + elif is_freebsd || is_openbsd; then + iostat -c 2 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' + else + echo "Unknown iostat version please create an issue" + fi + elif command_exists "sar"; then + sar -u 1 1 | sed '/^\s*$/d' | tail -n 1 | awk '{usage=100-$NF} END {printf("%3.1f%%", usage)}' | sed 's/,/./' + else + if is_cygwin; then + usage="$(WMIC cpu get LoadPercentage | grep -Eo '^[0-9]+')" + printf "%3.1f%%" $usage + else + load=`ps -aux | awk '{print $3}' | tail -n+2 | awk '{s+=$1} END {print s}'` + cpus=$(cpus_number) + echo "$load $cpus" | awk '{printf "%3.1f%%", $1/$2}' + fi + fi } main() { - print_cpu_percentage + print_cpu_percentage } main diff --git a/scripts/gpu_bg_color.sh b/scripts/gpu_bg_color.sh index c72b03c..873374f 100755 --- a/scripts/gpu_bg_color.sh +++ b/scripts/gpu_bg_color.sh @@ -13,25 +13,25 @@ gpu_medium_default_bg_color="#[bg=yellow]" gpu_high_default_bg_color="#[bg=red]" get_bg_color_settings() { - gpu_low_bg_color=$(get_tmux_option "@gpu_low_bg_color" "$gpu_low_default_bg_color") - gpu_medium_bg_color=$(get_tmux_option "@gpu_medium_bg_color" "$gpu_medium_default_bg_color") - gpu_high_bg_color=$(get_tmux_option "@gpu_high_bg_color" "$gpu_high_default_bg_color") + gpu_low_bg_color=$(get_tmux_option "@gpu_low_bg_color" "$gpu_low_default_bg_color") + gpu_medium_bg_color=$(get_tmux_option "@gpu_medium_bg_color" "$gpu_medium_default_bg_color") + gpu_high_bg_color=$(get_tmux_option "@gpu_high_bg_color" "$gpu_high_default_bg_color") } print_bg_color() { - local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') - local gpu_load_status=$(cpu_load_status $gpu_percentage) - if [ $gpu_load_status == "low" ]; then - echo "$gpu_low_bg_color" - elif [ $gpu_load_status == "medium" ]; then - echo "$gpu_medium_bg_color" - elif [ $gpu_load_status == "high" ]; then - echo "$gpu_high_bg_color" - fi + local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') + local gpu_load_status=$(cpu_load_status $gpu_percentage) + if [ $gpu_load_status == "low" ]; then + echo "$gpu_low_bg_color" + elif [ $gpu_load_status == "medium" ]; then + echo "$gpu_medium_bg_color" + elif [ $gpu_load_status == "high" ]; then + echo "$gpu_high_bg_color" + fi } main() { - get_bg_color_settings - print_bg_color + get_bg_color_settings + print_bg_color } main diff --git a/scripts/gpu_fg_color.sh b/scripts/gpu_fg_color.sh index 32c8072..100d46b 100755 --- a/scripts/gpu_fg_color.sh +++ b/scripts/gpu_fg_color.sh @@ -13,25 +13,25 @@ gpu_medium_default_fg_color="#[fg=yellow]" gpu_high_default_fg_color="#[fg=red]" get_fg_color_settings() { - gpu_low_fg_color=$(get_tmux_option "@gpu_low_fg_color" "$gpu_low_default_fg_color") - gpu_medium_fg_color=$(get_tmux_option "@gpu_medium_fg_color" "$gpu_medium_default_fg_color") - gpu_high_fg_color=$(get_tmux_option "@gpu_high_fg_color" "$gpu_high_default_fg_color") + gpu_low_fg_color=$(get_tmux_option "@gpu_low_fg_color" "$gpu_low_default_fg_color") + gpu_medium_fg_color=$(get_tmux_option "@gpu_medium_fg_color" "$gpu_medium_default_fg_color") + gpu_high_fg_color=$(get_tmux_option "@gpu_high_fg_color" "$gpu_high_default_fg_color") } print_fg_color() { - local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') - local gpu_load_status=$(cpu_load_status $gpu_percentage) - if [ $gpu_load_status == "low" ]; then - echo "$gpu_low_fg_color" - elif [ $gpu_load_status == "medium" ]; then - echo "$gpu_medium_fg_color" - elif [ $gpu_load_status == "high" ]; then - echo "$gpu_high_fg_color" - fi + local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') + local gpu_load_status=$(cpu_load_status $gpu_percentage) + if [ $gpu_load_status == "low" ]; then + echo "$gpu_low_fg_color" + elif [ $gpu_load_status == "medium" ]; then + echo "$gpu_medium_fg_color" + elif [ $gpu_load_status == "high" ]; then + echo "$gpu_high_fg_color" + fi } main() { - get_fg_color_settings - print_fg_color + get_fg_color_settings + print_fg_color } main diff --git a/scripts/gpu_icon.sh b/scripts/gpu_icon.sh index 3f54132..bd68ebb 100755 --- a/scripts/gpu_icon.sh +++ b/scripts/gpu_icon.sh @@ -15,26 +15,26 @@ gpu_high_default_icon="≣" # icons are set as script global variables get_icon_settings() { - gpu_low_icon=$(get_tmux_option "@gpu_low_icon" "$gpu_low_default_icon") - gpu_medium_icon=$(get_tmux_option "@gpu_medium_icon" "$gpu_medium_default_icon") - gpu_high_icon=$(get_tmux_option "@gpu_high_icon" "$gpu_high_default_icon") + gpu_low_icon=$(get_tmux_option "@gpu_low_icon" "$gpu_low_default_icon") + gpu_medium_icon=$(get_tmux_option "@gpu_medium_icon" "$gpu_medium_default_icon") + gpu_high_icon=$(get_tmux_option "@gpu_high_icon" "$gpu_high_default_icon") } print_icon() { - local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') - local gpu_load_status=$(cpu_load_status $gpu_percentage) - if [ $gpu_load_status == "low" ]; then - echo "$gpu_low_icon" - elif [ $gpu_load_status == "medium" ]; then - echo "$gpu_medium_icon" - elif [ $gpu_load_status == "high" ]; then - echo "$gpu_high_icon" - fi + local gpu_percentage=$($CURRENT_DIR/gpu_percentage.sh | sed -e 's/%//') + local gpu_load_status=$(cpu_load_status $gpu_percentage) + if [ $gpu_load_status == "low" ]; then + echo "$gpu_low_icon" + elif [ $gpu_load_status == "medium" ]; then + echo "$gpu_medium_icon" + elif [ $gpu_load_status == "high" ]; then + echo "$gpu_high_icon" + fi } main() { - get_icon_settings - local gpu_icon=$(print_icon "$1") - echo "$gpu_icon" + get_icon_settings + local gpu_icon=$(print_icon "$1") + echo "$gpu_icon" } main diff --git a/scripts/gpu_percentage.sh b/scripts/gpu_percentage.sh index cec15f9..091ce5c 100755 --- a/scripts/gpu_percentage.sh +++ b/scripts/gpu_percentage.sh @@ -5,21 +5,21 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$CURRENT_DIR/helpers.sh" print_gpu_percentage() { - if command_exists "nvidia-smi"; then - loads=$(nvidia-smi) - elif command_exists "cuda-smi"; then - loads=$(cuda-smi) - else - echo "nvidia-smi/cuda-smi not found" - return - fi - loads=$(echo "$loads" | sed -nr 's/.*\s([0-9]+)%.*/\1/p') - gpus=$(echo "$loads" | wc -l) - load=$(echo "$loads" | awk '{count+=$1} END {print count}') - echo "$load $gpus" | awk '{printf "%3.0f%%", $1/$2}' + if command_exists "nvidia-smi"; then + loads=$(nvidia-smi) + elif command_exists "cuda-smi"; then + loads=$(cuda-smi) + else + echo "nvidia-smi/cuda-smi not found" + return + fi + loads=$(echo "$loads" | sed -nr 's/.*\s([0-9]+)%.*/\1/p') + gpus=$(echo "$loads" | wc -l) + load=$(echo "$loads" | awk '{count+=$1} END {print count}') + echo "$load $gpus" | awk '{printf "%3.0f%%", $1/$2}' } main() { - print_gpu_percentage + print_gpu_percentage } main diff --git a/scripts/helpers.sh b/scripts/helpers.sh index d9028ae..b87b43b 100644 --- a/scripts/helpers.sh +++ b/scripts/helpers.sh @@ -1,64 +1,64 @@ get_tmux_option() { - local option="$1" - local default_value="$2" - local option_value="$(tmux show-option -gqv "$option")" - if [ -z "$option_value" ]; then - echo "$default_value" - else - echo "$option_value" - fi + local option="$1" + local default_value="$2" + local option_value="$(tmux show-option -gqv "$option")" + if [ -z "$option_value" ]; then + echo "$default_value" + else + echo "$option_value" + fi } is_osx() { - [ $(uname) == "Darwin" ] + [ $(uname) == "Darwin" ] } is_freebsd() { - [ $(uname) == "FreeBSD" ] + [ $(uname) == "FreeBSD" ] } is_openbsd() { - [ $(uname) == "OpenBSD" ] + [ $(uname) == "OpenBSD" ] } is_linux() { - [ $(uname) == "Linux" ] + [ $(uname) == "Linux" ] } is_cygwin() { - command -v WMIC &> /dev/null + command -v WMIC &> /dev/null } is_linux_iostat() { - # Bug in early versions of linux iostat -V return error code - iostat -c &> /dev/null + # Bug in early versions of linux iostat -V return error code + iostat -c &> /dev/null } # is second float bigger? fcomp() { - awk -v n1=$1 -v n2=$2 'BEGIN {if (n1 /dev/null + local command="$1" + command -v "$command" &> /dev/null }