From 8b56f68b09d1914dc14d12b5945e12cb57460a68 Mon Sep 17 00:00:00 2001 From: Gregory Pakosz Date: Sat, 2 Mar 2024 10:37:02 +0100 Subject: [PATCH] fixed triplet form battery palette, fixes #724 see also tmux/tmux#3867 --- .tmux.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index 599d4f1..3902887 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -258,7 +258,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # fi # # _bar() { -# bar_palette=$1 +# bar_palette=$(printf '%s' "$1" | tr ';' ',') # bar_symbol_empty=$2 # bar_symbol_full=$3 # bar_length=$4 @@ -327,7 +327,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # } # # _hbar() { -# hbar_palette=$1 +# hbar_palette=$(printf '%s' "$1" | tr ';' ',') # hbar_value=$2 # # if echo "$hbar_palette" | grep -q -E '^heat|gradient(,[#a-z0-9]{7,9})?$'; then @@ -361,7 +361,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # } # # _vbar() { -# vbar_palette=$1 +# vbar_palette=$(printf '%s' "$1" | tr ';' ',') # vbar_value=$2 # # if echo "$vbar_palette" | grep -q -E '^heat|gradient(,[#a-z0-9]{7,9})?$'; then @@ -1416,18 +1416,18 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # -e 's%#\{\?battery_bar%#\{?@battery_percentage%g' \ # -e 's%#\{\?battery_hbar%#\{?@battery_percentage%g' \ # -e 's%#\{\?battery_vbar%#\{?@battery_percentage%g' \ -# -e "s%#\{battery_bar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _bar '$tmux_conf_battery_bar_palette' '$tmux_conf_battery_bar_symbol_empty' '$tmux_conf_battery_bar_symbol_full' '$tmux_conf_battery_bar_length' '#{@battery_charge}' '#{client_width}')%g" \ -# -e "s%#\{battery_hbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _hbar '$tmux_conf_battery_hbar_palette' '#{@battery_charge}'')%g" \ -# -e "s%#\{battery_vbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _vbar '$tmux_conf_battery_vbar_palette' '#{@battery_charge}'')%g" \ +# -e "s%#\{battery_bar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _bar '$(printf '%s' "$tmux_conf_battery_bar_palette" | tr ',' ';')' '$tmux_conf_battery_bar_symbol_empty' '$tmux_conf_battery_bar_symbol_full' '$tmux_conf_battery_bar_length' '#{@battery_charge}' '#{client_width}')%g" \ +# -e "s%#\{battery_hbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _hbar '$(printf '%s' "$tmux_conf_battery_hbar_palette" | tr ',' ';') '#{@battery_charge}'')%g" \ +# -e "s%#\{battery_vbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _vbar '$(printf '%s' "$tmux_conf_battery_vbar_palette" | tr ',' ';')' '#{@battery_charge}'')%g" \ # -e 's%#\{(\?)?battery_status%#\{\1@battery_status%g' \ # -e 's%#\{(\?)?battery_percentage%#\{\1@battery_percentage%g') # status_right=$(echo "$status_right" | sed -E \ # -e 's%#\{\?battery_bar%#\{?@battery_percentage%g' \ # -e 's%#\{\?battery_hbar%#\{?@battery_percentage%g' \ # -e 's%#\{\?battery_vbar%#\{?@battery_percentage%g' \ -# -e "s%#\{battery_bar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _bar '$tmux_conf_battery_bar_palette' '$tmux_conf_battery_bar_symbol_empty' '$tmux_conf_battery_bar_symbol_full' '$tmux_conf_battery_bar_length' '#{@battery_charge}' '#{client_width}')%g" \ -# -e "s%#\{battery_hbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _hbar '$tmux_conf_battery_hbar_palette' '#{@battery_charge}'')%g" \ -# -e "s%#\{battery_vbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _vbar '$tmux_conf_battery_vbar_palette' '#{@battery_charge}'')%g" \ +# -e "s%#\{battery_bar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _bar '$(printf '%s' "$tmux_conf_battery_bar_palette" | tr ',' ';')' '$tmux_conf_battery_bar_symbol_empty' '$tmux_conf_battery_bar_symbol_full' '$tmux_conf_battery_bar_length' '#{@battery_charge}' '#{client_width}')%g" \ +# -e "s%#\{battery_hbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _hbar '$(printf '%s' "$tmux_conf_battery_hbar_palette" | tr ',' ';') '#{@battery_charge}'')%g" \ +# -e "s%#\{battery_vbar\}%#(nice cut -c3- '$TMUX_CONF' | sh -s _vbar '$(printf '%s' "$tmux_conf_battery_vbar_palette" | tr ',' ';')' '#{@battery_charge}'')%g" \ # -e 's%#\{(\?)?battery_status%#\{\1@battery_status%g' \ # -e 's%#\{(\?)?battery_percentage%#\{\1@battery_percentage%g') # status_right="#(echo; nice cut -c3- '$TMUX_CONF' | sh -s _battery_status '$tmux_conf_battery_status_charging' '$tmux_conf_battery_status_discharging')$status_right"