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

refactor: @catppuccin_flavour -> @catppuccin_flavor (#277)

Browse source 
Most catppuccin ports have adopted the spelling flavor.

`@catppuccin_flavour` is still available but no longer documented and
`@catppuccin_flavor` takes priority.
This commit is contained in:
vdbe 2024-08-14 18:48:10 +00:00 • committed by GitHub
parent 3ffbc3700b
commit 84a84bdd8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -64,7 +64,7 @@ set -g @plugin 'tmux-plugins/tpm'
3. (Optional) Set your preferred flavor, it defaults to `"mocha"`: 3. (Optional) Set your preferred flavor, it defaults to `"mocha"`:
```bash ```bash
set -g @catppuccin_flavour 'mocha' # latte,frappe, macchiato or mocha set -g @catppuccin_flavor 'mocha' # latte,frappe, macchiato or mocha
``` ```
### Manual ### Manual

13
catppuccin.tmux
View file

@ -27,7 +27,7 @@ main() {
# Batch options for loading the colorscheme and everyting before # Batch options for loading the colorscheme and everyting before
add_tmux_batch_option "@catppuccin_custom_plugin_dir" add_tmux_batch_option "@catppuccin_custom_plugin_dir"
add_tmux_batch_option "@catppuccin_flavour" add_tmux_batch_option "@catppuccin_flavor"
run_tmux_batch_commands run_tmux_batch_commands
@ -44,7 +44,16 @@ main() {
local color_interpolation=() local color_interpolation=()
local color_values=() local color_values=()
local temp local temp
theme="$(get_tmux_batch_option "@catppuccin_flavour" "mocha")"
theme="$(get_tmux_batch_option "@catppuccin_flavor" "")"
# NOTE: For backwards compatibility remove before 1.0.0 and set default for
# `@catppuccin_flavor` from `""` to `"mocha"`
if [ -z "$theme" ]; then
theme="$(get_tmux_option "@catppuccin_flavour" "mocha")"
tmux_echo "catppuccin warning: \\\"@catppuccin_flavour\\\" has been deprecated use \\\"@catppuccin_flavor\\\"" 103
fi
# NOTE: Pulling in the selected theme by the theme that's being set as local # NOTE: Pulling in the selected theme by the theme that's being set as local
# variables. # variables.
# https://github.com/dylanaraps/pure-sh-bible#parsing-a-keyval-file # https://github.com/dylanaraps/pure-sh-bible#parsing-a-keyval-file

4
utils/module_utils.sh
View file

@ -35,9 +35,9 @@ load_modules() {
if [[ -z "${module_name/ }" ]]; then if [[ -z "${module_name/ }" ]]; then
if [[ -z "${modules_list/ }" ]]; then if [[ -z "${modules_list/ }" ]]; then
tmux_echo "catppuccin warning: a module list has only white space, to remove all modules set it to \"null\"" 100 tmux_echo "catppuccin warning: a module list has only white space, to remove all modules set it to \\\"null\\\"" 100
else else
tmux_echo "catppuccin warning: a module list with value \"$modules_list\" has leading/trailing whitespace" 101 tmux_echo "catppuccin warning: a module list with value \\\"$modules_list\\\" has leading/trailing whitespace" 101
fi fi
continue continue
fi fi