Cleanup shellcheck warnings (#178)
* chore: shellcheck-warnings for catppuccin.tmux Command used: `shellcheck catppuccin.tmux -ax -s bash` * shellcheck: fix all warnings Command used: `shellcheck -a catppuccin.tmux $(ls custom/*.sh pane/*.sh status/*.sh window/*.sh)` * shellcheck: update workflow to check warnings * shellcheck: include warnings from sourced files
This commit is contained in:
vdbe
GitHub
parent
a1079943b6
commit
61727758ac
22 changed files with 193 additions and 139 deletions
|
|
@ -4,10 +4,15 @@
|
|||
PLUGIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
# import
|
||||
# shellcheck source=./builder/module_builder.sh
|
||||
source "${PLUGIN_DIR}/builder/module_builder.sh"
|
||||
# shellcheck source=./builder/window_builder.sh
|
||||
source "${PLUGIN_DIR}/builder/window_builder.sh"
|
||||
# shellcheck source=./builder/pane_builder.sh
|
||||
source "${PLUGIN_DIR}/builder/pane_builder.sh"
|
||||
# shellcheck source=./utils/tmux_utils.sh
|
||||
source "${PLUGIN_DIR}/utils/tmux_utils.sh"
|
||||
# shellcheck source=./utils/module_utils.sh
|
||||
source "${PLUGIN_DIR}/utils/module_utils.sh"
|
||||
|
||||
main() {
|
||||
|
|
@ -15,18 +20,20 @@ main() {
|
|||
local tmux_commands=()
|
||||
|
||||
# module directories
|
||||
local custom_path="$(get_tmux_option "@catppuccin_custom_plugin_dir" "${PLUGIN_DIR}/custom")"
|
||||
local modules_custom_path=$custom_path
|
||||
local modules_status_path=$PLUGIN_DIR/status
|
||||
local modules_window_path=$PLUGIN_DIR/window
|
||||
local modules_pane_path=$PLUGIN_DIR/pane
|
||||
local custom_path modules_custom_path modules_status_path modules_window_path modules_pane_path
|
||||
custom_path="$(get_tmux_option "@catppuccin_custom_plugin_dir" "${PLUGIN_DIR}/custom")"
|
||||
modules_custom_path=$custom_path
|
||||
modules_status_path=$PLUGIN_DIR/status
|
||||
modules_window_path=$PLUGIN_DIR/window
|
||||
modules_pane_path=$PLUGIN_DIR/pane
|
||||
|
||||
# load local theme
|
||||
local theme="$(get_tmux_option "@catppuccin_flavour" "mocha")"
|
||||
local theme
|
||||
theme="$(get_tmux_option "@catppuccin_flavour" "mocha")"
|
||||
# NOTE: Pulling in the selected theme by the theme that's being set as local
|
||||
# variables.
|
||||
# shellcheck source=catppuccin-frappe.tmuxtheme
|
||||
# https://github.com/dylanaraps/pure-sh-bible#parsing-a-keyval-file
|
||||
# shellcheck source=./catppuccin-frappe.tmuxtheme
|
||||
while IFS='=' read -r key val; do
|
||||
# Skip over lines containing comments.
|
||||
# (Lines starting with '#').
|
||||
|
|
@ -38,13 +45,15 @@ main() {
|
|||
done <"${PLUGIN_DIR}/catppuccin-${theme}.tmuxtheme"
|
||||
|
||||
# status general
|
||||
local status_default=$(get_tmux_option "@catppuccin_status_default" "on")
|
||||
local status_default status_justify status_background
|
||||
status_default=$(get_tmux_option "@catppuccin_status_default" "on")
|
||||
# shellcheck disable=SC2121
|
||||
set status "$status_default"
|
||||
|
||||
local status_justify=$(get_tmux_option "@catppuccin_status_justify" "left")
|
||||
status_justify=$(get_tmux_option "@catppuccin_status_justify" "left")
|
||||
set status-justify "$status_justify"
|
||||
|
||||
local status_background=$(get_tmux_option "@catppuccin_status_background" "theme")
|
||||
status_background=$(get_tmux_option "@catppuccin_status_background" "theme")
|
||||
if [ "${status_background}" = "theme" ]; then
|
||||
set status-bg "${thm_bg}"
|
||||
else
|
||||
|
|
@ -63,18 +72,21 @@ main() {
|
|||
set message-command-style "fg=${thm_cyan},bg=${thm_gray},align=centre"
|
||||
|
||||
# panes
|
||||
local pane_status_enable=$(get_tmux_option "@catppuccin_pane_status_enabled" "no") # yes
|
||||
local pane_border_status=$(get_tmux_option "@catppuccin_pane_border_status" "off") # bottom
|
||||
local pane_border_style=$(get_tmux_option "@catppuccin_pane_border_style" "fg=${thm_gray}")
|
||||
local pane_active_border_style=$(
|
||||
local pane_border_status pane_border_style \
|
||||
pane_active_border_style pane_left_separator pane_middle_separator \
|
||||
pane_right_separator pane_number_position pane_format
|
||||
pane_status_enable=$(get_tmux_option "@catppuccin_pane_status_enabled" "no") # yes
|
||||
pane_border_status=$(get_tmux_option "@catppuccin_pane_border_status" "off") # bottom
|
||||
pane_border_style=$(get_tmux_option "@catppuccin_pane_border_style" "fg=${thm_gray}")
|
||||
pane_active_border_style=$(
|
||||
get_tmux_option "@catppuccin_pane_active_border_style" \
|
||||
"#{?pane_in_mode,fg=${thm_yellow},#{?pane_synchronized,fg=${thm_magenta},fg=${thm_orange}}}"
|
||||
)
|
||||
local pane_left_separator=$(get_tmux_option "@catppuccin_pane_left_separator" "█")
|
||||
local pane_middle_separator=$(get_tmux_option "@catppuccin_pane_middle_separator" "█")
|
||||
local pane_right_separator=$(get_tmux_option "@catppuccin_pane_right_separator" "█")
|
||||
local pane_number_position=$(get_tmux_option "@catppuccin_pane_number_position" "left") # right, left
|
||||
local pane_format=$(load_modules "pane_default_format" "$modules_custom_path" "$modules_pane_path")
|
||||
pane_left_separator=$(get_tmux_option "@catppuccin_pane_left_separator" "█")
|
||||
pane_middle_separator=$(get_tmux_option "@catppuccin_pane_middle_separator" "█")
|
||||
pane_right_separator=$(get_tmux_option "@catppuccin_pane_right_separator" "█")
|
||||
pane_number_position=$(get_tmux_option "@catppuccin_pane_number_position" "left") # right, left
|
||||
pane_format=$(load_modules "pane_default_format" "$modules_custom_path" "$modules_pane_path")
|
||||
|
||||
setw pane-border-status "$pane_border_status"
|
||||
setw pane-active-border-style "$pane_active_border_style"
|
||||
|
|
@ -82,34 +94,39 @@ main() {
|
|||
setw pane-border-format "$pane_format"
|
||||
|
||||
# window
|
||||
local window_status_separator=$(get_tmux_option "@catppuccin_window_separator" "")
|
||||
local window_status_separator window_left_separator window_right_separator \
|
||||
window_middle_separator window_number_position window_status_enable \
|
||||
window_format window_current_format
|
||||
|
||||
window_status_separator=$(get_tmux_option "@catppuccin_window_separator" "")
|
||||
setw window-status-separator "$window_status_separator"
|
||||
|
||||
local window_left_separator=$(get_tmux_option "@catppuccin_window_left_separator" "█")
|
||||
local window_right_separator=$(get_tmux_option "@catppuccin_window_right_separator" "█")
|
||||
local window_middle_separator=$(get_tmux_option "@catppuccin_window_middle_separator" "█ ")
|
||||
local window_number_position=$(get_tmux_option "@catppuccin_window_number_position" "left") # right, left
|
||||
local window_status_enable=$(get_tmux_option "@catppuccin_window_status_enable" "no") # right, left
|
||||
window_left_separator=$(get_tmux_option "@catppuccin_window_left_separator" "█")
|
||||
window_right_separator=$(get_tmux_option "@catppuccin_window_right_separator" "█")
|
||||
window_middle_separator=$(get_tmux_option "@catppuccin_window_middle_separator" "█ ")
|
||||
window_number_position=$(get_tmux_option "@catppuccin_window_number_position" "left") # right, left
|
||||
window_status_enable=$(get_tmux_option "@catppuccin_window_status_enable" "no") # right, left
|
||||
|
||||
local 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 "$window_format"
|
||||
|
||||
local window_current_format=$(load_modules "window_current_format" "$modules_custom_path" "$modules_window_path")
|
||||
window_current_format=$(load_modules "window_current_format" "$modules_custom_path" "$modules_window_path")
|
||||
setw window-status-current-format "$window_current_format"
|
||||
|
||||
# status module
|
||||
local status_left_separator=$(get_tmux_option "@catppuccin_status_left_separator" "")
|
||||
local status_right_separator=$(get_tmux_option "@catppuccin_status_right_separator" "█")
|
||||
local status_right_separator_inverse=$(get_tmux_option "@catppuccin_status_right_separator_inverse" "no")
|
||||
local status_connect_separator=$(get_tmux_option "@catppuccin_status_connect_separator" "yes")
|
||||
local status_fill=$(get_tmux_option "@catppuccin_status_fill" "icon")
|
||||
local status_left_separator status_right_separator status_connect_separator \
|
||||
status_fill status_modules_left status_modules_right
|
||||
status_left_separator=$(get_tmux_option "@catppuccin_status_left_separator" "")
|
||||
status_right_separator=$(get_tmux_option "@catppuccin_status_right_separator" "█")
|
||||
status_connect_separator=$(get_tmux_option "@catppuccin_status_connect_separator" "yes")
|
||||
status_fill=$(get_tmux_option "@catppuccin_status_fill" "icon")
|
||||
|
||||
local status_modules_left=$(get_tmux_option "@catppuccin_status_modules_left" "")
|
||||
local loaded_modules_left=$(load_modules "$status_modules_left" "$modules_custom_path" "$modules_status_path")
|
||||
status_modules_left=$(get_tmux_option "@catppuccin_status_modules_left" "")
|
||||
loaded_modules_left=$(load_modules "$status_modules_left" "$modules_custom_path" "$modules_status_path")
|
||||
set status-left "$loaded_modules_left"
|
||||
|
||||
local status_modules_right=$(get_tmux_option "@catppuccin_status_modules_right" "application session")
|
||||
local loaded_modules_right=$(load_modules "$status_modules_right" "$modules_custom_path" "$modules_status_path")
|
||||
status_modules_right=$(get_tmux_option "@catppuccin_status_modules_right" "application session")
|
||||
loaded_modules_right=$(load_modules "$status_modules_right" "$modules_custom_path" "$modules_status_path")
|
||||
set status-right "$loaded_modules_right"
|
||||
|
||||
# modes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue