v4.3.0
===================================================================== --- Changes ------------------------------ - updated python scwrypts API to use latest pattern established in the nodejs library - SCWRYPTS_ROOT__scwrypts is now supports loading with each run and detects managed installations vs manual installations; this now means SCWRYPTS_ROOT can no longer be injected to scwrypts (this was a v2 legacy support thing and probably does not apply to you) --- New Features ------------------------- - pypi/scwrypts ) added 'get_generator' API to testing utilities to provide a nice way to include default generator options --- Bug Fixes ---------------------------- - scwrypts groups which use a required environment name regex no longer load specialized static files outside of the required environments.
This commit is contained in:
@ -1,14 +1,24 @@
|
||||
[[ $__SCWRYPT -eq 1 ]] && return 0
|
||||
#####################################################################
|
||||
|
||||
[ ! $SCWRYPTS_ROOT ] \
|
||||
&& SCWRYPTS_ROOT="$(cd $(dirname "${0:a:h}"); git rev-parse --show-toplevel 2>/dev/null)"
|
||||
SCWRYPTS_ROOT="$(cd -- ${0:a:h}; git rev-parse --show-toplevel 2>/dev/null)"
|
||||
|
||||
[ ! $SCWRYPTS_ROOT ] && [ -d /usr/share/scwrypts ] \
|
||||
&& SCWRYPTS_ROOT=/usr/share/scwrypts
|
||||
[ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] \
|
||||
|| SCWRYPTS_ROOT="$(echo "${0:a:h}" | sed -n 's|\(share/scwrypts\).*$|\1|p')"
|
||||
|
||||
[ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] || {
|
||||
echo "cannot determine scwrypts root path for current installation; aborting"
|
||||
exit 1
|
||||
}
|
||||
|
||||
export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"
|
||||
|
||||
[ -f "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY" ] \
|
||||
&& export SCWRYPTS_INSTALLATION_TYPE=$(cat "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY") \
|
||||
|| export SCWRYPTS_INSTALLATION_TYPE=manual \
|
||||
;
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
||||
DEFAULT_CONFIG="$SCWRYPTS_ROOT/zsh/lib/config.user.zsh"
|
||||
@ -21,11 +31,13 @@ USER_CONFIG_OVERRIDES="$SCWRYPTS_CONFIG_PATH/config.zsh"
|
||||
}
|
||||
source "$USER_CONFIG_OVERRIDES"
|
||||
|
||||
[ ! -d $SCWRYPTS_CONFIG_PATH ] && mkdir -p $SCWRYPTS_CONFIG_PATH
|
||||
[ ! -d $SCWRYPTS_DATA_PATH ] && mkdir -p $SCWRYPTS_DATA_PATH
|
||||
[ ! -d $SCWRYPTS_ENV_PATH ] && mkdir -p $SCWRYPTS_ENV_PATH
|
||||
[ ! -d $SCWRYPTS_LOG_PATH ] && mkdir -p $SCWRYPTS_LOG_PATH
|
||||
[ ! -d $SCWRYPTS_OUTPUT_PATH ] && mkdir -p $SCWRYPTS_OUTPUT_PATH
|
||||
mkdir -p \
|
||||
"$SCWRYPTS_CONFIG_PATH" \
|
||||
"$SCWRYPTS_DATA_PATH" \
|
||||
"$SCWRYPTS_ENV_PATH" \
|
||||
"$SCWRYPTS_LOG_PATH" \
|
||||
"$SCWRYPTS_OUTPUT_PATH" \
|
||||
;
|
||||
|
||||
export \
|
||||
SCWRYPTS_GROUPS \
|
||||
@ -62,7 +74,8 @@ done
|
||||
&& [ ! "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] \
|
||||
&& [ $GITHUB_WORKSPACE ] \
|
||||
&& [ ! $SCWRYPTS_GITHUB_NO_AUTOLOAD ] \
|
||||
&& SCWRYPTS_AUTODETECT_GROUP_BASEDIR="$GITHUB_WORKSPACE"
|
||||
&& SCWRYPTS_AUTODETECT_GROUP_BASEDIR="$GITHUB_WORKSPACE" \
|
||||
;
|
||||
|
||||
[ "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && [ -d "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && {
|
||||
for GROUP_LOADER in $(find "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" -type f -name \*scwrypts.zsh)
|
||||
@ -72,5 +85,4 @@ done
|
||||
}
|
||||
|
||||
#####################################################################
|
||||
[ $NO_EXPORT_CONFIG ] || __SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
|
||||
true
|
||||
__SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
|
||||
|
Reference in New Issue
Block a user