From 7218770f66a4087abf6b406ca2110595fe04e85c Mon Sep 17 00:00:00 2001 From: Marco Bergen Date: Wed, 22 Jan 2025 14:26:16 +0100 Subject: [PATCH 1/2] [#192] fixed regex for prereleasing --- build/make/prerelease.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build/make/prerelease.sh b/build/make/prerelease.sh index d9681767..19002808 100755 --- a/build/make/prerelease.sh +++ b/build/make/prerelease.sh @@ -22,12 +22,18 @@ prerelease_namespace() { # Update version in Dockerfile if [ -f "Dockerfile" ]; then echo "Updating version in Dockerfile..." - ORIG_NAME="$(grep -oP ".*[ ]*NAME=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" - ORIG_VERSION="$(grep -oP ".*[ ]*VERSION=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" + ORIG_NAME="$(grep -oP ".*[ ]+NAME=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" + echo 2 + ORIG_VERSION="$(grep -oP ".*[ ]+VERSION=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" + echo 3 PRERELEASE_NAME="prerelease_$( echo -e "$ORIG_NAME" | sed 's/\//\\\//g' )" + echo 4 PRERELEASE_VERSION="${ORIG_VERSION}${TIMESTAMP}" - sed -i "s/\(.*[ ]*NAME=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_NAME}\3/" Dockerfile - sed -i "s/\(.*[ ]*VERSION=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_VERSION}\3/" Dockerfile + echo "5 ${ORIG_NAME}++${ORIG_VERSION}++${PRERELEASE_NAME}++${PRERELEASE_VERSION}++" + sed -i "s/\(.* NAME=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_NAME}\3/" Dockerfile + echo 6 + sed -i "s/\(.* VERSION=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_VERSION}\3/" Dockerfile + echo 7 fi } From cfa29b73d1b558fd62914640b36ad414eff1d8ae Mon Sep 17 00:00:00 2001 From: Marco Bergen Date: Wed, 22 Jan 2025 14:26:46 +0100 Subject: [PATCH 2/2] [#192] fixed regex for prereleasing --- build/make/prerelease.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/make/prerelease.sh b/build/make/prerelease.sh index 19002808..ca67457f 100755 --- a/build/make/prerelease.sh +++ b/build/make/prerelease.sh @@ -23,17 +23,11 @@ prerelease_namespace() { if [ -f "Dockerfile" ]; then echo "Updating version in Dockerfile..." ORIG_NAME="$(grep -oP ".*[ ]+NAME=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" - echo 2 ORIG_VERSION="$(grep -oP ".*[ ]+VERSION=\"([^\"]*)" Dockerfile | awk -F "\"" '{print $2}')" - echo 3 PRERELEASE_NAME="prerelease_$( echo -e "$ORIG_NAME" | sed 's/\//\\\//g' )" - echo 4 PRERELEASE_VERSION="${ORIG_VERSION}${TIMESTAMP}" - echo "5 ${ORIG_NAME}++${ORIG_VERSION}++${PRERELEASE_NAME}++${PRERELEASE_VERSION}++" sed -i "s/\(.* NAME=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_NAME}\3/" Dockerfile - echo 6 sed -i "s/\(.* VERSION=\"\)\([^\"]*\)\(.*$\)/\1${PRERELEASE_VERSION}\3/" Dockerfile - echo 7 fi }