Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
6aba11d0be | |||
a945daeecc |
@ -56,7 +56,6 @@ export \
|
|||||||
source "$SCWRYPTS_ROOT/scwrypts.scwrypts.zsh" \
|
source "$SCWRYPTS_ROOT/scwrypts.scwrypts.zsh" \
|
||||||
|| FAIL 69 'failed to set up scwrypts group; aborting'
|
|| 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
|
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
|
__SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
|
||||||
|
@ -12,7 +12,7 @@ SCWRYPTS__GET_AVAILABLE_SCWRYPTS() {
|
|||||||
local GROUP GROUP_PATH GROUP_COLOR LOOKUP_PIDS=()
|
local GROUP GROUP_PATH GROUP_COLOR LOOKUP_PIDS=()
|
||||||
{
|
{
|
||||||
echo 'NAME^TYPE^GROUP'
|
echo 'NAME^TYPE^GROUP'
|
||||||
for GROUP in ${SCWRYPTS_GROUPS}
|
for GROUP in ${SCWRYPTS_GROUPS[@]}
|
||||||
do
|
do
|
||||||
GROUP_PATH=$(eval echo '$SCWRYPTS_ROOT__'$GROUP)
|
GROUP_PATH=$(eval echo '$SCWRYPTS_ROOT__'$GROUP)
|
||||||
GROUP_COLOR=$(eval echo '$SCWRYPTS_COLOR__'$GROUP)
|
GROUP_COLOR=$(eval echo '$SCWRYPTS_COLOR__'$GROUP)
|
||||||
|
@ -161,6 +161,8 @@ ACTIVATE_VIRTUALENV__scwrypts__zx() {
|
|||||||
UPDATE_VIRTUALENV__scwrypts__zx() {
|
UPDATE_VIRTUALENV__scwrypts__zx() {
|
||||||
local NPM_INSTALL_ARGS=()
|
local NPM_INSTALL_ARGS=()
|
||||||
|
|
||||||
|
[ $CI ] && NPM_INSTALL_ARGS+=(--ignore-scripts)
|
||||||
|
|
||||||
cd "$SCWRYPTS_ROOT__scwrypts/zx"
|
cd "$SCWRYPTS_ROOT__scwrypts/zx"
|
||||||
npm install ${NPM_INSTALL_ARGS[@]}
|
npm install ${NPM_INSTALL_ARGS[@]}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
FZF() {
|
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=()
|
local FZF_ARGS=()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user