diff --git a/zsh/lib/config.zsh b/zsh/lib/config.zsh index 109d0a7..f9b9fa3 100644 --- a/zsh/lib/config.zsh +++ b/zsh/lib/config.zsh @@ -56,7 +56,6 @@ export \ source "$SCWRYPTS_ROOT/scwrypts.scwrypts.zsh" \ || FAIL 69 'failed to set up scwrypts group; aborting' -SCWRYPTS_GROUPS=(scwrypts $(echo $SCWRYPTS_GROUPS | sed 's/\s\+/\n/g' | sort -u | grep -v '^scwrypts$')) ##################################################################### @@ -88,5 +87,9 @@ done done } +##################################################################### + +SCWRYPTS_GROUPS=(scwrypts $(echo $SCWRYPTS_GROUPS | sed 's/\s\+/\n/g' | sort -u | grep -v '^scwrypts$')) + ##################################################################### __SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt diff --git a/zsh/lib/scwrypts/run.module.zsh b/zsh/lib/scwrypts/run.module.zsh index 66de660..b01cd97 100644 --- a/zsh/lib/scwrypts/run.module.zsh +++ b/zsh/lib/scwrypts/run.module.zsh @@ -12,7 +12,7 @@ SCWRYPTS__GET_AVAILABLE_SCWRYPTS() { local GROUP GROUP_PATH GROUP_COLOR LOOKUP_PIDS=() { echo 'NAME^TYPE^GROUP' - for GROUP in ${SCWRYPTS_GROUPS} + for GROUP in ${SCWRYPTS_GROUPS[@]} do GROUP_PATH=$(eval echo '$SCWRYPTS_ROOT__'$GROUP) GROUP_COLOR=$(eval echo '$SCWRYPTS_COLOR__'$GROUP) diff --git a/zsh/lib/utils/io.fzf.zsh b/zsh/lib/utils/io.fzf.zsh index 8427557..89713e4 100644 --- a/zsh/lib/utils/io.fzf.zsh +++ b/zsh/lib/utils/io.fzf.zsh @@ -1,5 +1,8 @@ FZF() { - [ $CI ] && FAIL 1 'currently in CI, but FZF requires user input' + [ $CI ] && { + DEBUG "invoked FZF with $@" + FAIL 1 'currently in CI, but FZF requires user input' + } local FZF_ARGS=()