Merge pull request #8970 from zmstone/0915-sync-v4320-to-v449

Sync v4320 to v449
This commit is contained in:
Zaiming (Stone) Shi 2022-09-15 11:44:13 +02:00 committed by GitHub
commit 22862cdfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions

View File

@ -29,7 +29,7 @@
-ifndef(EMQX_ENTERPRISE). -ifndef(EMQX_ENTERPRISE).
-define(EMQX_RELEASE, {opensource, "4.4.9-alpha.2"}). -define(EMQX_RELEASE, {opensource, "4.4.9-alpha.3"}).
-else. -else.

View File

@ -70,19 +70,20 @@ otp_vsn_for() {
for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do
filename="$PROFILE-${tag#[e|v]}-otp$(otp_vsn_for "$tag")-$SYSTEM-$ARCH.zip" filename="$PROFILE-${tag#[e|v]}-otp$(otp_vsn_for "$tag")-$SYSTEM-$ARCH.zip"
url="https://packages.emqx.io/$DIR/$tag/$filename" url="https://packages.emqx.io/$DIR/$tag/$filename"
if [ ! -f "$filename" ] && curl -L -I -m 10 -o /dev/null -s -w "%{http_code}" "${url}" | grep -q -oE "^[23]+" ; then echo "downloading base package from ${url} ..."
echo "downloading base package from ${url} ..." if [ -f "$filename" ]; then
curl -L -o "${filename}" "${url}" echo "file $filename already downloaded; skikpped"
if [ "$SYSTEM" != "centos6" ]; then continue
echo "downloading sha256 sum from ${url}.sha256 ..." fi
curl -L -o "${filename}.sha256" "${url}.sha256" echo "downloading base package from ${url} ..."
SUMSTR=$(cat "${filename}.sha256") curl -L -o "${filename}" "${url}"
echo "got sha265sum: ${SUMSTR}" if [ "$SYSTEM" != "centos6" ]; then
## https://askubuntu.com/questions/1202208/checking-sha256-checksum echo "downloading sha256 sum from ${url}.sha256 ..."
echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1 curl -L -o "${filename}.sha256" "${url}.sha256"
fi SUMSTR=$(cat "${filename}.sha256")
else echo "got sha265sum: ${SUMSTR}"
echo "file $filename already downloaded or doesn't exist in the archives; skipping it" ## https://askubuntu.com/questions/1202208/checking-sha256-checksum
echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1
fi fi
done done