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

refactor(load_modules)

Browse source 
- Check if file exists instead of sourcing and checking for an error
- Loop over module directories
- Fix `module_index`: was treated as a string ("0", "0+1", "0+1+1")
This commit is contained in:
vdbewout 2024-01-10 12:12:14 +01:00
parent 2ff900dc7a
commit 3f3ee79e27
No known key found for this signature in database
GPG key ID: F4756403592D3E9F
1 changed files with 10 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

51
catppuccin.tmux
View file

@ -266,7 +266,7 @@ load_modules() {
local modules_window_path=$PLUGIN_DIR/window
local modules_pane_path=$PLUGIN_DIR/pane
local module_index=0;
local -i module_index=0;
local module_name
local loaded_modules
local IN=$modules_list
@ -281,47 +281,16 @@ load_modules() {
module_name=$iter
local module_path=$modules_custom_path/$module_name.sh
source $module_path
if [ 0 -eq $? ]
then
loaded_modules="$loaded_modules$( show_$module_name $module_index )"
module_index=$module_index+1
continue
fi
local module_path=$modules_status_path/$module_name.sh
source $module_path
if [ 0 -eq $? ]
then
loaded_modules="$loaded_modules$( show_$module_name $module_index )"
module_index=$module_index+1
continue
fi
local module_path=$modules_window_path/$module_name.sh
source $module_path
if [ 0 -eq $? ]
then
loaded_modules="$loaded_modules$( show_$module_name $module_index )"
module_index=$module_index+1
continue
fi
local module_path=$modules_pane_path/$module_name.sh
source $module_path
if [ 0 -eq $? ]
then
loaded_modules="$loaded_modules$( show_$module_name $module_index )"
module_index=$module_index+1
continue
fi
for module_dir in "${modules_custom_path}" "${modules_status_path}" "${modules_window_path}" "${modules_pane_path}" ; do
local module_path="$module_dir/$module_name.sh"
if [ -r "$module_path" ]; then
source $module_path
loaded_modules="$loaded_modules$( show_$module_name $module_index )"
module_index+=1
break
fi
done
done
echo "$loaded_modules"