From 368139d36d3908be0ccdbab6c1df99f43d01fc34 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 11 Jan 2024 14:01:00 +0300 Subject: [PATCH] a mit more consistent SKIP handling... Signed-off-by: Alex A. Naanou --- .pct-helpers | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.pct-helpers b/.pct-helpers index 65a42d4..6ff03dd 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -254,6 +254,9 @@ xreadYes(){ # xreadpass VAR # xreadpass(){ + if [[ ${!1} == 'SKIP' ]] ; then + return + fi local PASS1 local PASS2 for attempt in 1 2 3 ; do @@ -445,6 +448,7 @@ readVars(){ # # buildAssets [VAR ..] # +# XXX revise: SKIP handling... buildAssets(){ local template_dir=${TEMPLATE_DIR:-templates} local assets_dir=${ASSETS_DIR:-assets} @@ -473,6 +477,9 @@ buildAssets(){ ) for var in ${DFL_VARS[@]} ; do local val=${!var} + if [[ $val == SKIP ]] ; then + val= + fi PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'") done local IP_VARS=( @@ -486,11 +493,17 @@ buildAssets(){ ) for var in ${IP_VARS[@]} ; do local val=${!var} + if [[ $val == SKIP ]] ; then + val= + fi PATTERNS+=("-e 's/\\\${${var}}/${val/\/*}/g'") done # args... for var in $@ ; do local val=${!var} + if [[ $val == SKIP ]] ; then + val= + fi PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'") done