From abc469d6771a7b816b23ba1139baf5b2a902a19b Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sun, 24 Sep 2023 16:14:20 -0700 Subject: [PATCH] fix rm scripts --- sync/beta-release-sync-to-staging.sh | 2 +- sync/lh-release-sync-to-staging.sh | 2 +- sync/minor-release-sync-to-staging.sh | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sync/beta-release-sync-to-staging.sh b/sync/beta-release-sync-to-staging.sh index e6f7563..9ca733f 100644 --- a/sync/beta-release-sync-to-staging.sh +++ b/sync/beta-release-sync-to-staging.sh @@ -32,7 +32,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do for x in BaseOS Minimal; do if [[ "${x}" != "BaseOS" ]]; then echo "${x} ${ARCH}: Removing unnecessary boot image" - /bin/rm -v "${x}/${ARCH}/iso/"*boot* + /bin/rm -v "${x}/${ARCH}/iso/Rocky-${REVISION}-20"*"${ARCH}"*.iso fi echo "${x} ${ARCH}: Moving ISO images" mv "${x}/${ARCH}/iso/"* "isos/${ARCH}/" diff --git a/sync/lh-release-sync-to-staging.sh b/sync/lh-release-sync-to-staging.sh index 6deff48..be359ec 100644 --- a/sync/lh-release-sync-to-staging.sh +++ b/sync/lh-release-sync-to-staging.sh @@ -32,7 +32,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do for x in BaseOS Minimal; do if [[ "${x}" != "BaseOS" ]]; then echo "${x} ${ARCH}: Removing unnecessary boot image" - /bin/rm -v "${x}/${ARCH}/iso/"*boot* + /bin/rm -v "${x}/${ARCH}/iso/Rocky-${REVISION}-20"*"${ARCH}"*.iso fi echo "${x} ${ARCH}: Moving ISO images" mv "${x}/${ARCH}/iso/"* "isos/${ARCH}/" diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index 334c68e..dd7c2cd 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -28,10 +28,6 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do # Sort the ISO's for ARCH in "${ARCHES[@]}"; do for x in BaseOS Minimal; do - if [[ "${x}" != "BaseOS" ]]; then - echo "${x} ${ARCH}: Removing unnecessary boot image" - /bin/rm -v "${x}/${ARCH}/iso/"*boot* - fi echo "${x} ${ARCH}: Moving ISO images" mv "${x}/${ARCH}/iso/"* "isos/${ARCH}/" done