Compare commits

..

2 Commits

Author SHA1 Message Date
62a1945f70 merge...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2024-01-12 00:49:26 +03:00
368139d36d a mit more consistent SKIP handling...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2024-01-11 14:01:00 +03:00

View File

@ -254,6 +254,9 @@ xreadYes(){
# xreadpass VAR # xreadpass VAR
# #
xreadpass(){ xreadpass(){
if [[ ${!1} == 'SKIP' ]] ; then
return
fi
local PASS1 local PASS1
local PASS2 local PASS2
for attempt in 1 2 3 ; do for attempt in 1 2 3 ; do
@ -445,6 +448,7 @@ readVars(){
# #
# buildAssets [VAR ..] # buildAssets [VAR ..]
# #
# XXX revise: SKIP handling...
buildAssets(){ buildAssets(){
local template_dir=${TEMPLATE_DIR:-templates} local template_dir=${TEMPLATE_DIR:-templates}
local assets_dir=${ASSETS_DIR:-assets} local assets_dir=${ASSETS_DIR:-assets}
@ -473,6 +477,9 @@ buildAssets(){
) )
for var in ${DFL_VARS[@]} ; do for var in ${DFL_VARS[@]} ; do
local val=${!var} local val=${!var}
if [[ $val == SKIP ]] ; then
val=
fi
PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'") PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'")
done done
local IP_VARS=( local IP_VARS=(
@ -487,11 +494,17 @@ buildAssets(){
for var in ${IP_VARS[@]} ; do for var in ${IP_VARS[@]} ; do
var=${var%n} var=${var%n}
local val=${!var} local val=${!var}
if [[ $val == SKIP ]] ; then
val=
fi
PATTERNS+=("-e 's/\\\${${var}n}/${val/\/*}/g'") PATTERNS+=("-e 's/\\\${${var}n}/${val/\/*}/g'")
done done
# args... # args...
for var in $@ ; do for var in $@ ; do
local val=${!var} local val=${!var}
if [[ $val == SKIP ]] ; then
val=
fi
PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'") PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'")
done done