fix: support bash-it

one-bash · Dec 2, 2022 · 9e21750 · 9e21750
1 parent 0433a49
commit 9e21750
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bash/entry.bash b/bash/entry.bash
@@ -74,6 +74,9 @@ _one_load "bash/env.bash"
 # shellcheck source=./one-complete.bash
 _one_load "bash/one-complete.bash"
 
+# shellcheck source=../deps/bash-it/lib/utilities.bash
+[[ $ONE_BASH_IT_ENABLE == true ]] && . "$ONE_BASH_IT_DIR/lib/utilities.bash"
+
 # shellcheck source=./enable-mods.bash
 [[ $ONE_NO_MODS == false ]] && _one_load "bash/enable-mods.bash"
 

diff --git a/bash/mod.bash b/bash/mod.bash
@@ -30,7 +30,7 @@ compgen_enable_mod() {
   done
 
   for dir in "${plugin_dirs[@]}" ; do
-    find "$dir" -maxdepth 1 -type f -name "*.bash" -exec basename {} ".bash" \;
+    find -L "$dir" -maxdepth 1 -type f -name "*.bash" -exec basename {} ".bash" \;
   done
 }
 
@@ -61,7 +61,7 @@ list_mod() {
     # shellcheck disable=2154
     if [[ ! -d "$ONE_REPO/$ts" ]]; then continue; fi
 
-    find "$ONE_REPO/$ts" -maxdepth 1 -type f -exec basename {} ".bash" \; | sort | tr '\n' ' '
+    find -L "$ONE_REPO/$ts" -maxdepth 1 -type f -exec basename {} ".bash" \;
   done
 }
 
@@ -72,7 +72,7 @@ list_mod_path() {
     # shellcheck disable=2154
     if [[ ! -d "$ONE_REPO/$ts" ]]; then continue; fi
 
-    find "$ONE_REPO/$ts" -maxdepth 1 -type f | sort | tr '\n' ' '
+    find -L "$ONE_REPO/$ts" -maxdepth 1 -type f | sort | tr '\n' ' '
   done
 }