From cb4e047d8bda8e881050871c04fc2449f0cca719 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 13 Jan 2023 15:32:50 -0700 Subject: [PATCH] fix vars --- sync/common_8 | 2 +- sync/common_9 | 2 +- sync/sync-to-staging.delete.sh | 5 +++-- sync/sync-to-staging.sh | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sync/common_8 b/sync/common_8 index 6244bf6..08810d0 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -29,7 +29,7 @@ PRODUCTION_ROOT="/mnt/repos-production" # relative to ${ENV}_ROOT CATEGORY_STUB="mirror/pub/rocky" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" -RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}/latest-${SHORT}-${MAJ}" +RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}/latest-${SHORT}-${MAJOR}" # Set all repos that have no comps/groups associated with them. This is even in # cases where repos will not be available by normal means. It's just for diff --git a/sync/common_9 b/sync/common_9 index 79eb50e..144fd38 100644 --- a/sync/common_9 +++ b/sync/common_9 @@ -28,7 +28,7 @@ PRODUCTION_ROOT="/mnt/repos-production" # relative to ${ENV}_ROOT CATEGORY_STUB="mirror/pub/rocky" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" -RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}/latest-${SHORT}-${MAJ}${APPEND_TO_DIR}" +RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}/latest-${SHORT}-${MAJOR}${APPEND_TO_DIR}" # Set all repos that have no comps/groups associated with them. This is even in # cases where repos will not be available by normal means. It's just for diff --git a/sync/sync-to-staging.delete.sh b/sync/sync-to-staging.delete.sh index b1b8f97..dd8be5b 100644 --- a/sync/sync-to-staging.delete.sh +++ b/sync/sync-to-staging.delete.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Short name (eg, NFV, extras, Rocky, gluster9) +SHORT=${1} + # Source common variables # shellcheck disable=SC2046,1091,1090 source "$(dirname "$0")/common" @@ -11,8 +14,6 @@ fi # Major Version (eg, 8) MAJ=${RLVER} -# Short name (eg, NFV, extras, Rocky, gluster9) -SHORT=${1} cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } ret_val=$? diff --git a/sync/sync-to-staging.sh b/sync/sync-to-staging.sh index 969bb24..156e4d3 100644 --- a/sync/sync-to-staging.sh +++ b/sync/sync-to-staging.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Short name (eg, NFV, extras, Rocky, gluster9) +SHORT=${1} + # Source common variables # shellcheck disable=SC2046,1091,1090 source "$(dirname "$0")/common" @@ -11,8 +14,6 @@ fi # Major Version (eg, 8) MAJ=${RLVER} -# Short name (eg, NFV, extras, Rocky, gluster9) -SHORT=${1} cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } ret_val=$?