From 0cab21c1d970040c0cdd6cba793d03756abc61ff Mon Sep 17 00:00:00 2001 From: Al Bowles Date: Thu, 11 May 2023 21:58:06 -0500 Subject: [PATCH] cheers neil --- scripts/run-all-flavors.sh | 4 ++-- scripts/run-openqa-tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh index becb564d..cda3a704 100755 --- a/scripts/run-all-flavors.sh +++ b/scripts/run-all-flavors.sh @@ -8,8 +8,8 @@ set -e ROCKY_VERSION="9.2" -MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION) -MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION) +MAJOR_VERSION=${ROCKY_VERSION:0:1} +MINOR_VERSION=${ROCKY_VERSION:2:1} ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION" diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh index 80e9f98e..124977f3 100755 --- a/scripts/run-openqa-tests.sh +++ b/scripts/run-openqa-tests.sh @@ -14,8 +14,8 @@ set -e ROCKY_VERSION="9.2" -MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION) -MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION) +MAJOR_VERSION=${ROCKY_VERSION:0:1} +MINOR_VERSION=${ROCKY_VERSION:2:1} ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"