v3.0.2

=====================================================================

--- Bug fixes ----------------------------

- interactive scripts work again

- color works on zx again

.env.template

@@ -3,8 +3,6 @@ export AWS_ACCOUNT=
 export AWS_PROFILE=
 export AWS_REGION=
 export AWS__EFS__LOCAL_MOUNT_POINT=
-export AWS__S3__MEDIA_BUCKET=
-export AWS__S3__MEDIA_TARGETS=
 export DIRECTUS__API_TOKEN=
 export DIRECTUS__BASE_URL=
 export DISCORD__BOT_TOKEN=
@@ -15,6 +13,8 @@ export I3__DMENU_FONT_SIZE=
 export I3__GLOBAL_FONT_SIZE=
 export I3__MODEL_CONFIG=
 export LINEAR__API_TOKEN=
+export MEDIA_SYNC__S3_BUCKET
+export MEDIA_SYNC__TARGETS
 export REDIS_AUTH=
 export REDIS_HOST=
 export REDIS_PORT=

.env.template.descriptions

@@ -4,9 +4,6 @@ AWS_REGION   |
 
 AWS__EFS__LOCAL_MOUNT_POINT  | fully-qualified path to mount the EFS drive
 
-AWS__S3__MEDIA_BUCKET   | s3 bucket name and filesystem targets for media backups
-AWS__S3__MEDIA_TARGETS  |
-
 DIRECTUS__API_TOKEN | details for a directus instance
 DIRECTUS__BASE_URL  |
 
@@ -21,6 +18,9 @@ I3__MODEL_CONFIG        |
 
 LINEAR__API_TOKEN  | linear.app project management configuration
 
+MEDIA_SYNC__S3_BUCKET | s3 bucket name and filesystem targets for media backups
+MEDIA_SYNC__TARGETS   |
+
 REDIS_AUTH  | redis connection credentials
 REDIS_HOST  |
 REDIS_PORT  |

run

@@ -217,6 +217,11 @@ __RUN() {
 		export ENV_NAME
 	}
 
+	for f in $(eval 'echo $SCWRYPTS_STATIC_CONFIG__'$SCWRYPT_GROUP)
+	do
+		source "$f" || FAIL 5 "invalid static config '$f'"
+	done
+
 	##########################################
 
 	[ ! $SUBSCWRYPT ] \
@@ -230,7 +235,7 @@ __RUN() {
 
 	##########################################
 
-	local LOGFILE=$(__GET_LOGFILE $SCRIPT)
+	local LOGFILE=$(__GET_LOGFILE)
 
 	local HEADER=$(
 		[ $SUBSCWRYPT ] && return 0
@@ -303,13 +308,13 @@ __VALIDATE_UPSTREAM_TIMELINE() {
 }
 
 __GET_LOGFILE() {
-	local SCRIPT="$1"
-
 	[ $SUBSCWRYPT ] \
-		|| [[ $SCRIPT =~ scwrypts/logs ]] \
-		|| [[ $SCRIPT =~ interactive ]] \
+		|| [[ $SCWRYPT_NAME =~ scwrypts/logs ]] \
+		|| [[ $SCWRYPT_NAME =~ interactive ]] \
 		&& return 0
 
+	echo 'gets a logfile' >&2
+
 	echo "$SCWRYPTS_LOG_PATH/$(echo $GROUP/$TYPE/$NAME | sed 's/^\.\///; s/\//\%/g').log"
 }
 

zsh/lib/scwrypts/run.module.zsh

@@ -116,5 +116,5 @@ SCWRYPTS__GET_RUNSTRING__py() {
 SCWRYPTS__GET_RUNSTRING__zx() {
 	__CHECK_DEPENDENCY zx || return 1
 
-	echo "FORCE_COLOR=3; cd $GROUP_PATH; ./$TYPE/$NAME.js"
+	echo "export FORCE_COLOR=3; cd $GROUP_PATH; ./$TYPE/$NAME.js"
 }

zsh/lib/scwrypts/virtualenv.module.zsh

@@ -49,7 +49,7 @@ UPDATE_VIRTUALENV() {
 	cd $SCWRYPTS_ROOT
 	local UPDATE_CODE=0
 	case $TYPE in
-		py ) cd py; pip install -r requirements.txt; UPDATE_CODE=$? ;;
+		py ) cd py; pip install --no-cache-dir -r requirements.txt; UPDATE_CODE=$? ;;
 		zx ) cd zx; npm install ;;
 	esac
 	UPDATE_CODE=$?
@@ -83,7 +83,11 @@ DELETE_VIRTUALENV() {
 GET_VIRTUALENV_PATH() {
 	local GROUP="$1"
 	local TYPE="$2"
-	eval echo '$SCWRYPTS_VIRTUALENV_PATH__'$GROUP/$TYPE
+
+	local ENV_PATH="$(eval echo '$SCWRYPTS_VIRTUALENV_PATH__'$GROUP 2>/dev/null)"
+	[ ! $ENV_PATH ] && ENV_PATH="$SCWRYPTS_VIRTUALENV_PATH__scwrypts"
+
+	echo $ENV_PATH/$TYPE
 }
 
 #####################################################################

zsh/scwrypts/environment/synchronize

@@ -119,7 +119,7 @@ ADD_LINES() {
 	do
 		VARIABLE=$(echo $LINE | sed 's/=.*$//')
 		echo $CONTENT | grep -qi "^$VARIABLE" || {
-			echo $LINE | grep -qi '__[a-z_]\+=' || {
+			echo $LINE | grep -q '__[a-z_]\+=' || {
 				WARNING "skipping variable $(echo $LINE | sed 's/^export //; s/=.*//')
 					(must be included in a template before it can be added)"
 				continue
@@ -142,6 +142,7 @@ READ_POPULATED_VARIABLES() {
 		| awk '/^[^=]+$/{printf "%s_____",$0;next}7' \
 		| sed 's/\(_____\)\(export\)/\1\n\2/; s/\(_____\)$/\1\n/' \
 		| sed 's/^.*_____.*$/_____&/' \
+		| sed 's/^_____export/export/' \
 		| sed -z 's/[\n
 ] *_____/_____/g' \
 		| grep -v '^$' \