From acd5c0cd7289a3e0c1d2ec41cc7b49572dbf90f1 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 1 Mar 2016 12:08:48 -0300 Subject: Use a function to create nanobsd image filename and reduce duplicated code --- tools/builder_defaults.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/builder_defaults.sh') diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 7649179..f996546 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -339,6 +339,10 @@ export OVAPATH=${OVAPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION # set full-update update filename export UPDATES_TARBALL_FILENAME=${UPDATES_TARBALL_FILENAME:-"${UPDATESDIR}/${PRODUCT_NAME}-Full-Update-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.tgz"} +# nanobsd templates +export NANOBSD_IMG_TEMPLATE=${NANOBSD_IMG_TEMPLATE:-"${PRODUCT_NAME}-${PRODUCT_VERSION}-%%SIZE%%-${TARGET}-%%TYPE%%${TIMESTAMP_SUFFIX}.img"} +export NANOBSD_UPGRADE_TEMPLATE=${NANOBSD_UPGRADE_TEMPLATE:-"${PRODUCT_NAME}-${PRODUCT_VERSION}-%%SIZE%%-${TARGET}-%%TYPE%%-upgrade${TIMESTAMP_SUFFIX}.img"} + # Rsync data to send snapshots export RSYNCUSER=${RSYNCUSER:-"snapshots"} export RSYNCPATH=${RSYNCPATH:-"/usr/local/www/snapshots/${TARGET}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} -- cgit v1.1