From bccb90c2fd3d1f0d44229163f9f5849e07c9c0e9 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Wed, 10 Nov 2021 16:23:13 -0700 Subject: [PATCH] fixes for ISO placement and other stuff --- sync/common_8 | 1 + sync/minor-release-sync-to-staging.sh | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sync/common_8 b/sync/common_8 index c189960..bc7c292 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -48,6 +48,7 @@ NONSIG_COMPOSE=( Extras Plus NFV + rockyrpi ) declare -A SIG_COMPOSE diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index 0571245..65ebb63 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -49,10 +49,12 @@ for ARCH in "${ARCHES[@]}"; do TARGET_ARCH="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${x}/${ARCH}/iso" mkdir -p "${SOURCE}" "${TARGET}" "${TARGET_ARCH}" # Copy the ISO and manifests into their target architecture - cp "${SOURCE}/*.iso*" "${TARGET_ARCH}/" - cp "${SOURCE}/CHECKSUM" "${TARGET_ARCH}/" + cp -n "${SOURCE}"/*.iso "${TARGET_ARCH}/" + cp -n "${SOURCE}"/*.iso.manifest "${TARGET_ARCH}/" + cp -n "${SOURCE}/CHECKSUM" "${TARGET_ARCH}/" # Copy the ISO and manifests into the main isos target - cp "${SOURCE}/*.iso*" "${TARGET}/" + cp "${SOURCE}"/*.iso "${TARGET}/" + cp "${SOURCE}"/*.iso.manifest "${TARGET}/" cat "${SOURCE}/CHECKSUM" >> "${TARGET}/CHECKSUM" done done