From d278d4decebb59b11d6d63acb3075fc4bebcb373 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 22 Jun 2022 09:58:15 +1000 Subject: [PATCH] fix to update.sh Signed-off-by: Lachlan Roberts --- update.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 42b697ce..4fed9c51 100755 --- a/update.sh +++ b/update.sh @@ -64,7 +64,8 @@ fi paths=( "${paths[@]%/}" ) REPOSITORY_URL="${REPOSITORY_URL:=https://repo1.maven.org/maven2/org/eclipse/jetty}" -JETTY_HOME_URL="$REPOSITORY_URL/jetty-home/$JETTY_VERSION/jetty-home-$JETTY_VERSION.tar.gz" +JETTY_HOME_URL="$REPOSITORY_URL/jetty-home/\$JETTY_VERSION/jetty-home-\$JETTY_VERSION.tar.gz" +JETTY_DISTRO_URL="$REPOSITORY_URL/jetty-distribution/\$JETTY_VERSION/jetty-distribution-\$JETTY_VERSION.tar.gz" MAVEN_METADATA_URL="$REPOSITORY_URL/jetty-server/maven-metadata.xml" available=( $( curl -sSL "$MAVEN_METADATA_URL" | grep -Eo '<(version)>[^<]*' | awk -F'[<>]' '{ print $3 }' | sort -Vr ) ) @@ -127,7 +128,7 @@ for path in "${paths[@]}"; do sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "$path/Dockerfile" # Update repository URL. - sed -ri 's|^(ENV JETTY_TGZ_URL) .*|\1 '"$JETTY_HOME_URL"'|; ' "$path/Dockerfile" + sed -ri 's|^(ENV JETTY_TGZ_URL) .*|\1 '"$JETTY_DISTRO_URL"'|; ' "$path/Dockerfile" fi fi done