Skip to content

Commit d4361d8

Browse files
[release/10.0] Fix URL format for JDK download on linux (#65074)
* Fix URL format for JDK download on linux * Fix tar command to unpack JDK archive correctly * Fix tar command for JDK installation filename * Change JDK tarball name to microsoft-jdk --------- Co-authored-by: Brennan <brecon@microsoft.com>
1 parent 92f48d1 commit d4361d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

eng/helix/content/installjdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
echo "PlatformArch: $platformarch"
2323
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2424
output_dir="$DIR/java"
25-
url="https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/java/microsoft-jdk-${java_version}_${platformarch}.tar.gz"
25+
url="https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/java/microsoft-jdk-${java_version}-${platformarch}.tar.gz"
2626
echo "Downloading from: $url"
2727
tmp="$(mktemp -d -t install-jdk.XXXXXX)"
2828

@@ -41,6 +41,6 @@ curl -Lsfo $(basename $url) "$url" --retry 5
4141
echo "Installing java from $(basename $url) $url"
4242
mkdir $output_dir
4343
echo "Unpacking to $output_dir"
44-
tar --strip-components 1 -xzf "jdk-${java_version}_${platformarch}_bin.tar.gz" --no-same-owner --directory "$output_dir"
44+
tar --strip-components 1 -xzf "microsoft-jdk-${java_version}-${platformarch}.tar.gz" --no-same-owner --directory "$output_dir"
4545

4646
popd

0 commit comments

Comments
 (0)