Merge 65aceb849f
into 9a3a10bf10
This commit is contained in:
commit
6a5d9702ef
|
@ -41,7 +41,7 @@ if test -z "${CONFIG_FILE}"; then
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
source ${CONFIG_FILE}
|
source "${CONFIG_FILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
|
CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
|
||||||
|
|
7
build.sh
7
build.sh
|
@ -229,7 +229,10 @@ fi
|
||||||
mkdir -p "${WORK_DIR}"
|
mkdir -p "${WORK_DIR}"
|
||||||
log "Begin ${BASE_DIR}"
|
log "Begin ${BASE_DIR}"
|
||||||
|
|
||||||
STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}
|
SAVEIFS=$IFS
|
||||||
|
IFS=$(echo -en "\n\b")
|
||||||
|
|
||||||
|
STAGE_LIST=${STAGE_LIST:-"${BASE_DIR}"/stage*}
|
||||||
|
|
||||||
for STAGE_DIR in $STAGE_LIST; do
|
for STAGE_DIR in $STAGE_LIST; do
|
||||||
STAGE_DIR=$(realpath "${STAGE_DIR}")
|
STAGE_DIR=$(realpath "${STAGE_DIR}")
|
||||||
|
@ -261,3 +264,5 @@ if [ -x ${BASE_DIR}/postrun.sh ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log "End ${BASE_DIR}"
|
log "End ${BASE_DIR}"
|
||||||
|
|
||||||
|
IFS=$SAVEIFS
|
||||||
|
|
Loading…
Reference in New Issue
Block a user