ringofstorms/tmux-catppuccin-coal
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: warning @catppuccin_window_status (#294)

Browse source 
No longer print warning if `@catppuccin_window_status` is not used
This commit is contained in:
vdbe 2024-08-14 22:06:05 +00:00 • committed by GitHub
parent 41f2cf2e7a
commit 9ee1695d75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
builder/window_builder.sh
View file

@ -12,20 +12,23 @@ build_window_format() {
# NOTE: For backwards compatibility remove before 1.0.0 and update default for # NOTE: For backwards compatibility remove before 1.0.0 and update default for
# `@catppuccin_window_status` # `@catppuccin_window_status`
if [ -z "$window_status" ]; then if [ "$window_status" = "no" ]; then
window_status_enable="$(get_tmux_option "@catppuccin_window_status_enable" "no")" window_status_enable="$(get_tmux_option "@catppuccin_window_status_enable" "")"
tmux_echo "catppuccin warning: \\\"@catppuccin_window_status_enable\\\" and \\\"@catppuccin_window_status_icon_enable\\\" has been replaced by\n\t \
\\\"@catppuccin_window_status\\\" with the options \\\"no\\\", \\\"icon\\\" and \\\"text\\\"" 104
if [ "$window_status_enable" = "yes" ]; then if [ -n "$window_status_enable" ]; then
window_status_icon_enable="$(get_tmux_option "@catppuccin_window_status_icon_enable" "yes")" tmux_echo "catppuccin warning: \\\"@catppuccin_window_status_enable\\\" and \\\"@catppuccin_window_status_icon_enable\\\" has been replaced by\n\t \
if [ "$window_status_icon_enable" = "yes" ]; then \\\"@catppuccin_window_status\\\" with the options \\\"no\\\", \\\"icon\\\" and \\\"text\\\"" 104
window_status="icon"
if [ "$window_status_enable" = "yes" ]; then
window_status_icon_enable="$(get_tmux_option "@catppuccin_window_status_icon_enable" "yes")"
if [ "$window_status_icon_enable" = "yes" ]; then
window_status="icon"
else
window_status="text"
fi
else else
window_status="text" window_status="no"
fi fi
else
window_status="no"
fi fi
fi fi
@ -126,7 +129,7 @@ build_window_icon() {
# meaning 2 calls to build_window_icon wich will/should both return the same # meaning 2 calls to build_window_icon wich will/should both return the same
# result. # result.
if [ -z "$show_window_status" ]; then if [ -z "$show_window_status" ]; then
local window_status_icon_enable custom_icon_window_last \ local custom_icon_window_last \
custom_icon_window_zoom custom_icon_window_mark custom_icon_window_mark \ custom_icon_window_zoom custom_icon_window_mark custom_icon_window_mark \
custom_icon_window_silent custom_icon_window_activity custom_icon_window_bell custom_icon_window_silent custom_icon_window_activity custom_icon_window_bell
@ -135,7 +138,6 @@ build_window_icon() {
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local tmux_batch_options=() local tmux_batch_options=()
add_tmux_batch_option "@catppuccin_window_status_icon_enable"
add_tmux_batch_option "@catppuccin_icon_window_last" add_tmux_batch_option "@catppuccin_icon_window_last"
add_tmux_batch_option "@catppuccin_icon_window_current" add_tmux_batch_option "@catppuccin_icon_window_current"
add_tmux_batch_option "@catppuccin_icon_window_zoom" add_tmux_batch_option "@catppuccin_icon_window_zoom"
@ -146,7 +148,6 @@ build_window_icon() {
run_tmux_batch_commands run_tmux_batch_commands
window_status_icon_enable=$(get_tmux_batch_option "@catppuccin_window_status_icon_enable" "yes")
custom_icon_window_last=$(get_tmux_batch_option "@catppuccin_icon_window_last" "󰖰") custom_icon_window_last=$(get_tmux_batch_option "@catppuccin_icon_window_last" "󰖰")
custom_icon_window_current=$(get_tmux_batch_option "@catppuccin_icon_window_current" "󰖯") custom_icon_window_current=$(get_tmux_batch_option "@catppuccin_icon_window_current" "󰖯")
custom_icon_window_zoom=$(get_tmux_batch_option "@catppuccin_icon_window_zoom" "󰁌") custom_icon_window_zoom=$(get_tmux_batch_option "@catppuccin_icon_window_zoom" "󰁌")

2
catppuccin.tmux
View file

@ -183,7 +183,7 @@ main() {
# NOTE: update default to `"no"` when removing the backwards compatibility for # NOTE: update default to `"no"` when removing the backwards compatibility for
# `@catppuccin_window_status_enable` and # `@catppuccin_window_status_enable` and
# `@catppuccin_window_status_icon_enable` in ./builder/window_builder.sh # `@catppuccin_window_status_icon_enable` in ./builder/window_builder.sh
window_status=$(get_tmux_batch_option "@catppuccin_window_status" "") # no, icon, text window_status=$(get_tmux_batch_option "@catppuccin_window_status" "no") # no, icon, text
window_format=$(load_modules "window_default_format" "$modules_custom_path" "$modules_window_path") window_format=$(load_modules "window_default_format" "$modules_custom_path" "$modules_window_path")
setw window-status-format "$(do_color_interpolation "$window_format")" setw window-status-format "$(do_color_interpolation "$window_format")"