flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-12-17 17:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

a mit more consistent SKIP handling...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2024-01-11 14:01:00 +03:00
parent 4cff069d4d
commit 368139d36d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.pct-helpers
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=(
@ -486,11 +493,17 @@ buildAssets(){
) )
for var in ${IP_VARS[@]} ; do for var in ${IP_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
# 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