File tree Expand file tree Collapse file tree 4 files changed +30
-5
lines changed Expand file tree Collapse file tree 4 files changed +30
-5
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ function download {
5050 if [[ " ${filename} " =~ ^Alibaba_Dragonwell_(Standard| Extended) ]]
5151 then
5252 # shellcheck disable=SC2016
53- regex=' s/^Alibaba_Dragonwell_(?: Standard|Extended)_([0-9\+.]{1,}[^_]*)(?:_alpine)?[_-](?:(GA|Experimental|GA_Experimental|FP1)_)?(aarch64|x64)_(Linux|linux|Windows|windows)\.(.*)$/VERSION ="$1" JAVA_VERSION="$1 " RELEASE_TYPE="$2 " ARCH="$3 " OS="$4 " EXT="$5 "/g'
53+ regex=' s/^Alibaba_Dragonwell_(Standard|Extended)_([0-9\+.]{1,}[^_]*)(?:_alpine)?[_-](?:(GA|Experimental|GA_Experimental|FP1)_)?(aarch64|x64)_(Linux|linux|Windows|windows)\.(.*)$/EDITION ="$1" VERSION="$2" JAVA_VERSION="$2 " RELEASE_TYPE="$3 " ARCH="$4 " OS="$5 " EXT="$6 "/g'
5454 elif [[ " ${filename} " = Alibaba_Dragonwell* ]];
5555 then
5656 # shellcheck disable=SC2016
@@ -60,6 +60,7 @@ function download {
6060 regex=' s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g'
6161 fi
6262
63+ local EDITION=" "
6364 local VERSION=" "
6465 local JAVA_VERSION=" "
6566 local RELEASE_TYPE=" "
@@ -99,6 +100,11 @@ function download {
99100 FEATURES=' musl'
100101 fi
101102
103+ if [[ " ${EDITION} " = " Extended" ]]
104+ then
105+ FEATURES+=" ${FEATURES: + } cloud"
106+ fi
107+
102108 local json
103109 json=" $( metadata_json \
104110 " ${VENDOR} " \
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ function download {
5050 if [[ " ${filename} " =~ ^Alibaba_Dragonwell_(Standard| Extended) ]]
5151 then
5252 # shellcheck disable=SC2016
53- regex=' s/^Alibaba_Dragonwell_(?: Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION ="$1" JAVA_VERSION="$1 " ARCH="$2 " OS="$3 " EXT="$4 "/g'
53+ regex=' s/^Alibaba_Dragonwell_(Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION ="$1" VERSION="$2" JAVA_VERSION="$2 " ARCH="$3 " OS="$4 " EXT="$5 "/g'
5454 elif [[ " ${filename} " = Alibaba_Dragonwell* ]];
5555 then
5656 # shellcheck disable=SC2016
@@ -60,6 +60,7 @@ function download {
6060 regex=' s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g'
6161 fi
6262
63+ local EDITION=" "
6364 local VERSION=" "
6465 local JAVA_VERSION=" "
6566 local RELEASE_TYPE=" "
@@ -99,6 +100,11 @@ function download {
99100 FEATURES=' musl'
100101 fi
101102
103+ if [[ " ${EDITION} " = " Extended" ]]
104+ then
105+ FEATURES+=" ${FEATURES: + } cloud"
106+ fi
107+
102108 local json
103109 json=" $( metadata_json \
104110 " ${VENDOR} " \
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ function download {
5050 if [[ " ${filename} " =~ ^Alibaba_Dragonwell_(Standard| Extended) ]]
5151 then
5252 # shellcheck disable=SC2016
53- regex=' s/^Alibaba_Dragonwell_(?: Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION ="$1" JAVA_VERSION="$1 " ARCH="$2 " OS="$3 " EXT="$4 "/g'
53+ regex=' s/^Alibaba_Dragonwell_(Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION ="$1" VERSION="$2" JAVA_VERSION="$2 " ARCH="$3 " OS="$4 " EXT="$5 "/g'
5454 elif [[ " ${filename} " = Alibaba_Dragonwell* ]];
5555 then
5656 # shellcheck disable=SC2016
@@ -60,6 +60,7 @@ function download {
6060 regex=' s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g'
6161 fi
6262
63+ local EDITION=" "
6364 local VERSION=" "
6465 local JAVA_VERSION=" "
6566 local RELEASE_TYPE=" "
@@ -99,6 +100,11 @@ function download {
99100 FEATURES=' musl'
100101 fi
101102
103+ if [[ " ${EDITION} " = " Extended" ]]
104+ then
105+ FEATURES+=" ${FEATURES: + } cloud"
106+ fi
107+
102108 local json
103109 json=" $( metadata_json \
104110 " ${VENDOR} " \
Original file line number Diff line number Diff line change @@ -46,11 +46,13 @@ function download {
4646 then
4747 download_file " ${url} " " ${archive} " || return 1
4848
49+ local EDITION=" "
4950 local VERSION=" "
5051 local RELEASE_TYPE=" "
5152 local OS=" "
5253 local ARCH=" "
5354 local EXT=" "
55+ local FEATURES=" "
5456 if [[ " ${filename} " == ' Alibaba_Dragonwell8_Linux_x64_8.0-preview.tar.gz' ]]
5557 then
5658 VERSION=" 8.0.0-preview"
@@ -68,7 +70,7 @@ function download {
6870 elif [[ " ${filename} " =~ ^Alibaba_Dragonwell_(Standard| Extended) ]]
6971 then
7072 # shellcheck disable=SC2016
71- local regex=' s/^Alibaba_Dragonwell[-_](?: Standard|Extended)[-_]([0-9].{1,})[-_](x64|aarch64)[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION ="$1" ARCH ="$2" OS ="$3" EXT ="$4"/g'
73+ local regex=' s/^Alibaba_Dragonwell[-_](Standard|Extended)[-_]([0-9].{1,})[-_](x64|aarch64)[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION ="$1" VERSION ="$2" ARCH ="$3" OS ="$4" EXT="$5 "/g'
7274
7375 # Parse meta-data from file name
7476 eval " $( perl -pe " ${regex} " <<< " ${asset_name}" ) "
@@ -93,6 +95,11 @@ function download {
9395 return 1
9496 fi
9597
98+ if [[ " ${EDITION} " = " Extended" ]]
99+ then
100+ FEATURES+=" ${FEATURES: + } cloud"
101+ fi
102+
96103 local json
97104 json=" $( metadata_json \
98105 " ${VENDOR} " \
@@ -105,7 +112,7 @@ function download {
105112 " $( normalize_arch " ${ARCH} " ) " \
106113 " ${EXT} " \
107114 ' jdk' \
108- ' ' \
115+ " ${FEATURES} " \
109116 " ${url} " \
110117 " $( hash_file ' md5' " ${archive} " " ${CHECKSUM_DIR} " ) " \
111118 " $( hash_file ' sha1' " ${archive} " " ${CHECKSUM_DIR} " ) " \
You can’t perform that action at this time.
0 commit comments