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

Compare commits

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

No commits in common. "62a1945f70539495c9a107fdb33f8191af8afa5e" and "49ba65de1eb931864c4a8aa1f3323b26d4a7dfe2" have entirely different histories.
62a1945f70 ... 49ba65de1e

1 changed files with 0 additions and 13 deletions
Show Stats Expand all files Collapse all files

13
.pct-helpers
View File

@ -254,9 +254,6 @@ 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
@ -448,7 +445,6 @@ 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}
@ -477,9 +473,6 @@ 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=(
@ -494,17 +487,11 @@ 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