From e61e827eb93c71f3b0fe1e7e07b5ca4887587532 Mon Sep 17 00:00:00 2001
From: txtsd <thexerothermicsclerodermoid@gmail.com>
Date: Mon, 7 Feb 2022 15:48:47 +0530
Subject: Use Adoptium JREs

---
 .github/scripts/prepare_JREs.sh | 49 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100755 .github/scripts/prepare_JREs.sh

(limited to '.github/scripts')

diff --git a/.github/scripts/prepare_JREs.sh b/.github/scripts/prepare_JREs.sh
new file mode 100755
index 00000000..1525fdb9
--- /dev/null
+++ b/.github/scripts/prepare_JREs.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+URL_JDK8="https://api.adoptium.net/v3/binary/latest/8/ga/linux/x64/jre/hotspot/normal/eclipse"
+URL_JDK17="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jre/hotspot/normal/eclipse"
+
+mkdir -p JREs
+pushd JREs
+
+wget --content-disposition "$URL_JDK8"
+wget --content-disposition "$URL_JDK17"
+
+for file in *;
+do
+    mkdir temp
+
+    # Handle OpenJDK17 archive
+    re='(OpenJDK17U-jre_x64_linux_hotspot_17.(.*).tar.gz)'
+    if [[ $file =~ $re ]];
+    then
+        version=${BASH_REMATCH[2]}
+        version_edit=$(echo $version | sed -e 's/_/+/g')
+        dir_name=jdk-17.$version_edit-jre
+        echo $dir_name
+        mkdir jre17
+        tar -xzf $file -C temp
+        pushd temp/$dir_name
+        cp -r . ../../jre17
+        popd
+
+    fi
+
+    # Handle OpenJDK8 archive
+    re='(OpenJDK8U-jre_x64_linux_hotspot_8(.*).tar.gz)'
+    if [[ $file =~ $re ]];
+    then
+        version=${BASH_REMATCH[2]}
+        version_edit=$(echo $version | sed -e 's/b/-b/g')
+        dir_name=jdk8$version_edit-jre
+        mkdir jre8
+        tar -xzf $file -C temp
+        pushd temp/$dir_name
+        cp -r . ../../jre8
+        popd
+    fi
+
+    rm -rf temp
+done
+
+popd
-- 
cgit 


From 0ba61bb5903a22044decaa9390437e83be0dadd7 Mon Sep 17 00:00:00 2001
From: txtsd <thexerothermicsclerodermoid@gmail.com>
Date: Tue, 8 Feb 2022 08:55:52 +0530
Subject: Implement even more PR suggestions

---
 .github/scripts/prepare_JREs.sh | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to '.github/scripts')

diff --git a/.github/scripts/prepare_JREs.sh b/.github/scripts/prepare_JREs.sh
index 1525fdb9..b85e9c2f 100755
--- a/.github/scripts/prepare_JREs.sh
+++ b/.github/scripts/prepare_JREs.sh
@@ -13,33 +13,25 @@ for file in *;
 do
     mkdir temp
 
-    # Handle OpenJDK17 archive
-    re='(OpenJDK17U-jre_x64_linux_hotspot_17.(.*).tar.gz)'
+    re='(OpenJDK([[:digit:]]+)U-jre_x64_linux_hotspot_([[:digit:]]+)(.*).tar.gz)'
     if [[ $file =~ $re ]];
     then
-        version=${BASH_REMATCH[2]}
-        version_edit=$(echo $version | sed -e 's/_/+/g')
-        dir_name=jdk-17.$version_edit-jre
-        echo $dir_name
-        mkdir jre17
+        version_major=${BASH_REMATCH[2]}
+        version_trailing=${BASH_REMATCH[4]}
+
+        if [ $version_major = 17 ];
+        then
+            hyphen='-'
+        else
+            hyphen=''
+        fi
+
+        version_edit=$(echo $version_trailing | sed -e 's/_/+/g' | sed -e 's/b/-b/g')
+        dir_name=jdk$hyphen$version_major$version_edit-jre
+        mkdir jre$version_major
         tar -xzf $file -C temp
         pushd temp/$dir_name
-        cp -r . ../../jre17
-        popd
-
-    fi
-
-    # Handle OpenJDK8 archive
-    re='(OpenJDK8U-jre_x64_linux_hotspot_8(.*).tar.gz)'
-    if [[ $file =~ $re ]];
-    then
-        version=${BASH_REMATCH[2]}
-        version_edit=$(echo $version | sed -e 's/b/-b/g')
-        dir_name=jdk8$version_edit-jre
-        mkdir jre8
-        tar -xzf $file -C temp
-        pushd temp/$dir_name
-        cp -r . ../../jre8
+        cp -r . ../../jre$version_major
         popd
     fi
 
-- 
cgit