From 3f3ee79e27ba9df05ce581a0de19dac5f20cf0ae Mon Sep 17 00:00:00 2001
From: vdbewout <vdbewout@gmail.com>
Date: Wed, 10 Jan 2024 12:12:14 +0100
Subject: [PATCH] refactor(load_modules)

- 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")
---
 catppuccin.tmux | 51 ++++++++++---------------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/catppuccin.tmux b/catppuccin.tmux
index edf25b4..5c543d4 100755
--- a/catppuccin.tmux
+++ b/catppuccin.tmux
@@ -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"