From 65ad175cf4e05813e09a37a4816d92bc4ab99875 Mon Sep 17 00:00:00 2001 From: Rezart Qelibari Date: Wed, 20 Apr 2022 00:39:03 +0200 Subject: [PATCH] Handle zwc autoloading case too --- modules/lib.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/lib.sh b/modules/lib.sh index 308fcb4..666a541 100644 --- a/modules/lib.sh +++ b/modules/lib.sh @@ -3,8 +3,13 @@ function autoloadZShLib() { test -d "${ASTZWEIG_ZSHLIB}" || { echo "This module needs astzweig/zshlib to work." >&2; return 99 } FPATH="${ASTZWEIG_ZSHLIB}:${FPATH}" - local funcNames=(${(f)"$(find "${ASTZWEIG_ZSHLIB}" -type f -perm +u=x -maxdepth 1 | awk -F/ '{ print $NF }')"}) - autoload -Uz "${funcNames[@]}" + fpath+=(${ASTZWEIG_ZSHLIB}) + if [[ -d ${ASTZWEIG_ZSHLIB} ]]; then + local funcNames=($(find "${ASTZWEIG_ZSHLIB}" -type f -perm +u=x -maxdepth 1 | awk -F/ '{ print $NF }')) + autoload -Uz ${funcNames} + elif [[ -f ${ASTZWEIG_ZSHLIB} ]]; then + autoload -Uzw ${ASTZWEIG_ZSHLIB} + fi } function isDebug() {