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

Compare commits

base: flynx:49ba65de1eb931864c4a8aa1f3323b26d4a7dfe2
Branches Tags
flynx:master
...
compare: flynx:62a1945f70539495c9a107fdb33f8191af8afa5e
Branches Tags
flynx:master

2 Commits
49ba65de1e ... 62a1945f70

Author SHA1 Message Date
Alex A. Naanou
62a1945f70 merge... 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
 2024-01-12 00:49:26 +03:00
Alex A. Naanou
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
1 changed files with 13 additions and 0 deletions
Show Stats Expand all files Collapse all files

13
.pct-helpers
View File

@ -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=(
@ -487,11 +494,17 @@ buildAssets(){
for var in ${IP_VARS[@]} ; do
var=${var%n}
local val=${!var}
if [[ $val == SKIP ]] ; then
val=
fi
PATTERNS+=("-e 's/\\\${${var}n}/${val/\/*}/g'")
done
# args...
for var in $@ ; do
local val=${!var}
if [[ $val == SKIP ]] ; then
val=
fi
PATTERNS+=("-e 's/\\\${${var}}/${val//\//\\/}/g'")
done