From d1edea8f2c99a1dccca5fdee1ceb1f93d9fc3ec8 Mon Sep 17 00:00:00 2001
From: Robert Lu <robberphex@gmail.com>
Date: Sat, 7 Mar 2020 23:29:36 +0800
Subject: [PATCH] =?UTF-8?q?adoptopenjdk=E7=9B=AE=E5=BD=95=E5=88=86?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adoptopenjdk.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adoptopenjdk.sh b/adoptopenjdk.sh
index 57a3bc5..c75732c 100755
--- a/adoptopenjdk.sh
+++ b/adoptopenjdk.sh
@@ -7,10 +7,10 @@ BASE_PATH="${TUNASYNC_WORKING_DIR}"
 # 参数为版本，比如8,11等
 function downloadRelease() {
   curl -s "https://api.adoptopenjdk.net/v2/latestAssets/releases/openjdk$1" | \
-    jq -r '.[]| [.version,.binary_type,.architecture,.os,.binary_name,.binary_link,.checksum_link,.installer_name,.installer_link,.installer_checksum_link]| @tsv' | \
-    while IFS=$'\t' read -r version binary_type architecture os binary_name binary_link checksum_link installer_name installer_link installer_checksum_link; do
-      mkdir -p "$BASE_PATH/$version/$binary_type/$architecture/$os/" || true
-      dest_filename="$BASE_PATH/$version/$binary_type/$architecture/$os/$binary_name"
+    jq -r '.[]| [.version,.version_data.semver,.binary_type,.architecture,.os,.binary_name,.binary_link,.checksum_link,.installer_name,.installer_link,.installer_checksum_link]| @tsv' | \
+    while IFS=$'\t' read -r version semver binary_type architecture os binary_name binary_link checksum_link installer_name installer_link installer_checksum_link; do
+      mkdir -p "$BASE_PATH/$version/$semver/$binary_type/$architecture/$os/" || true
+      dest_filename="$BASE_PATH/$version/$semver/$binary_type/$architecture/$os/$binary_name"
       declare downloaded=false
       if [[ -f $dest_filename ]]; then
         echo "Skiping $binary_name"
@@ -24,7 +24,7 @@ function downloadRelease() {
         }
       done
       if [[ ! -z "$installer_name" ]]; then
-        dest_filename="$BASE_PATH/$version/$binary_type/$architecture/$os/$installer_name"
+        dest_filename="$BASE_PATH/$version/$semver/$binary_type/$architecture/$os/$installer_name"
         downloaded=false
         if [[ -f $dest_filename ]]; then
           echo "Skiping $installer_name"