mirror of
https://github.com/flynx/proxmox-utils.git
synced 2025-12-17 09:01:49 +00:00
a mit more consistent SKIP handling...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
4cff069d4d
commit
368139d36d
13
.pct-helpers
13
.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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user