axzshctl set-theme completion: Look for all types in custom_themes/ and rpositories

[ax-zsh.git] / core / 50_axzsh / functions / _axzsh

diff --git a/core/50_axzsh/functions/_axzsh b/core/50_axzsh/functions/_axzsh
index 2f6ab781f6c4b375c8c1138958e7cd3f8833b58b..ea32b58ab9cf3c8ddb4f411d7797336f11235d28 100644 (file)
--- a/core/50_axzsh/functions/_axzsh
+++ b/core/50_axzsh/functions/_axzsh
@@ -22,13 +22,17 @@ _axzshctl() {
                case "$words[2]" in
                  "enable-plugin"|"disable-plugin")
                        compadd "$@" -- \
-                               $(ls -1 "$AXZSH"/plugins) \
-                               $(ls -1 "$AXZSH"/custom_plugins)
+                               "$AXZSH"/plugins/*(/:t) \
+                               "$AXZSH"/custom_plugins/*(N/:t) \
+                               "$AXZSH"/repos/*(/:t:s/#/\\/)
                        ;;
                  "set-theme")
                        compadd "$@" -- "-" \
-                               $(ls -1 "$AXZSH"/themes | cut -d'.' -f1) \
-                               $(find "$AXZSH/custom_plugins" "$AXZSH/repos" -maxdepth 2 -iname '*.zsh-theme' -exec basename {} \; | cut -d'.' -f1)
+                               "$AXZSH"/themes/*.axzshtheme(:r:t) \
+                               "$AXZSH"/custom_themes/*.axzshtheme(N:r:t) \
+                               "$AXZSH"/custom_themes/*.zsh-theme(N:r:t) \
+                               "$AXZSH"/repos/*/*.axzshtheme(N:r:t) \
+                               "$AXZSH"/repos/*/*.zsh-theme(N:r:t)
                        ;;
                esac
                ;;