From 8c333b4dbaf586f6a9f84ac475cfbf50c14e5549 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 8 Mar 2016 10:38:59 -0300 Subject: Simplify logic --- tools/builder_common.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 809698d..a3fca08 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -2317,7 +2317,7 @@ snapshots_copy_to_staging_nanobsd() { snapshots_copy_to_staging_iso_updates() { local _img="" - for _img in ${ISOPATH} ${MEMSTICKPATH} ${MEMSTICKSERIALPATH}; do + for _img in ${ISOPATH} ${MEMSTICKPATH} ${MEMSTICKSERIALPATH} ${MEMSTICKADIPATH}; do if [ ! -f "${_img}.gz" ]; then continue fi @@ -2332,12 +2332,6 @@ snapshots_copy_to_staging_iso_updates() { snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${UPDATES_TARBALL_FILENAME}) fi - if [ "${TARGET}" = "amd64" -a -f "${MEMSTICKADIPATH}.gz" ]; then - sha256 ${MEMSTICKADIPATH}.gz > ${MEMSTICKADIPATH}.sha256 - cp -l ${MEMSTICKADIPATH}* $STAGINGAREA/ 2>/dev/null - snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${MEMSTICKADIPATH}) - fi - # NOTE: Updates need a file with output similar to date output # Use the file generated at start of snapshots_dobuilds() to be consistent on times if [ -z "${_IS_RELEASE}" ]; then -- cgit v1.1