Compare commits

..

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

View File

@ -254,9 +254,6 @@ xreadYes(){
# xreadpass VAR
#
xreadpass(){
if [[ ${!1} == 'SKIP' ]] ; then
return
fi
local PASS1
local PASS2
for attempt in 1 2 3 ; do
@ -448,7 +445,6 @@ readVars(){
#
# buildAssets [VAR ..]
#
# XXX revise: SKIP handling...
buildAssets(){
local template_dir=${TEMPLATE_DIR:-templates}
local assets_dir=${ASSETS_DIR:-assets}
@ -477,9 +473,6 @@ 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=(
@ -494,17 +487,11 @@ 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