var corrections and simplify

This commit is contained in:
Louis Abel 2023-01-13 15:17:35 -07:00
parent 977ad26b83
commit 05118b018c
Signed by: label
GPG Key ID: B37E62D143879B36
2 changed files with 8 additions and 15 deletions

View File

@ -4,34 +4,32 @@
case "${RLREL}" in case "${RLREL}" in
stable) stable)
REVISION=8.7 REVISION=8.7
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-RC1" APPEND_TO_DIR="-RC1"
;; ;;
beta) beta)
REVISION=8.8 REVISION=8.8
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-BETA" APPEND_TO_DIR="-BETA"
COMPOSE_APPEND="${APPEND_TO_DIR}"
;; ;;
lh) lh)
REVISION=8.8 REVISION=8.8
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-LookAhead" APPEND_TO_DIR="-LookAhead"
COMPOSE_APPEND="${APPEND_TO_DIR}"
;; ;;
*) *)
echo "option no recognized" echo "option no recognized"
;; ;;
esac esac
MAJOR="${REVISION%.*}"
MINOR="${REVISION#*.}"
STAGING_ROOT="/mnt/repos-staging" STAGING_ROOT="/mnt/repos-staging"
PRODUCTION_ROOT="/mnt/repos-production" PRODUCTION_ROOT="/mnt/repos-production"
# relative to ${ENV}_ROOT # relative to ${ENV}_ROOT
CATEGORY_STUB="mirror/pub/rocky" CATEGORY_STUB="mirror/pub/rocky"
RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJ}${APPEND_TO_DIR}" RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}"
# Set all repos that have no comps/groups associated with them. This is even in # 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 # cases where repos will not be available by normal means. It's just for

View File

@ -4,20 +4,14 @@
case "${RLREL}" in case "${RLREL}" in
stable) stable)
REVISION=9.1 REVISION=9.1
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-RC4" APPEND_TO_DIR="-RC4"
;; ;;
beta) beta)
REVISION=9.2 REVISION=9.2
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-BETA" APPEND_TO_DIR="-BETA"
;; ;;
lh) lh)
REVISION=9.2 REVISION=9.2
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
APPEND_TO_DIR="-LookAhead" APPEND_TO_DIR="-LookAhead"
;; ;;
*) *)
@ -25,15 +19,16 @@ case "${RLREL}" in
;; ;;
esac esac
MAJOR="${REVISION%.*}"
MINOR="${REVISION#*.}"
ARCHES=(x86_64 aarch64 ppc64le s390x) ARCHES=(x86_64 aarch64 ppc64le s390x)
STAGING_ROOT="/mnt/repos-staging" STAGING_ROOT="/mnt/repos-staging"
PRODUCTION_ROOT="/mnt/repos-production" PRODUCTION_ROOT="/mnt/repos-production"
# relative to ${ENV}_ROOT # relative to ${ENV}_ROOT
CATEGORY_STUB="mirror/pub/rocky" CATEGORY_STUB="mirror/pub/rocky"
RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJ}" RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}"
# Set all repos that have no comps/groups associated with them. This is even in # 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 # cases where repos will not be available by normal means. It's just for