aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBłażej Sowa <[email protected]>2018-12-19 13:06:57 +0100
committerXECDesign <[email protected]>2018-12-21 04:11:13 +0000
commitd7ca8e8f143293c9803e48501675832af0a3108e (patch)
treec39d0e3cade6957ff741db18c9aa1defedd330e3
parent08405eb792c66acf7f4fa4d11abf31bb3da5ab13 (diff)
Allow custom deploy zip filename
-rwxr-xr-xbuild.sh1
-rwxr-xr-xexport-image/04-finalise/01-run.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 213be84..c44e6db 100755
--- a/build.sh
+++ b/build.sh
@@ -145,6 +145,7 @@ fi
export USE_QEMU="${USE_QEMU:-0}"
export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"}"
+export ZIP_FILENAME="${ZIP_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"}"
BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR="${BASE_DIR}/scripts"
diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
index eee9c5c..f5a5fd8 100755
--- a/export-image/04-finalise/01-run.sh
+++ b/export-image/04-finalise/01-run.sh
@@ -74,10 +74,10 @@ unmount_image "${IMG_FILE}"
mkdir -p "${DEPLOY_DIR}"
-rm -f "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip"
+rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}.zip"
pushd "${STAGE_WORK_DIR}" > /dev/null
-zip "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip" \
+zip "${DEPLOY_DIR}/${ZIP_FILENAME}.zip" \
"$(basename "${IMG_FILE}")"
popd > /dev/null