From 826ad27dc3e9ccfaa30a9d903311c1c987fab454 Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 18 Dec 2025 13:10:20 +0800 Subject: [PATCH] Use CNB --- check-download.sh | 38 +++++++++++++++++--------------------- check-update.sh | 33 ++++++++------------------------- download.json | 31 ++++++++++++++++++++----------- update.json | 4 ++-- 4 files changed, 47 insertions(+), 59 deletions(-) diff --git a/check-download.sh b/check-download.sh index e7090b9..98c06d3 100755 --- a/check-download.sh +++ b/check-download.sh @@ -1,46 +1,42 @@ #!/usr/bin/bash -set -e +set -euo pipefail -HMCL_CHANNEL="$1" -HMCL_VERSION="$2" - -case "$HMCL_CHANNEL" in - dev) - HMCL_ARTIFACT_ID="hmcl-dev";; - *) - echo "Unknown channel: $HMCL_CHANNEL" >&2 - exit 1 - ;; -esac +HMCL_VERSION="$1" if [[ ! "$HMCL_VERSION" =~ ^3(\.[0-9]+)+$ ]]; then echo "Unsupported version: $HMCL_VERSION" >&2 exit 1 fi -MAVEN_CENTRAL_BASE="https://repo1.maven.org/maven2" -MAVEN_CENTRAL_MIRROR_BASE="https://mirrors.cloud.tencent.com/nexus/repository/maven-public" +CNB_DOWNLOAD_FILE_URL_BASE="https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v$HMCL_VERSION/HMCL-$HMCL_VERSION" -HMCL_JAR_URL="$MAVEN_CENTRAL_MIRROR_BASE/org/glavo/hmcl/$HMCL_ARTIFACT_ID/$HMCL_VERSION/$HMCL_ARTIFACT_ID-$HMCL_VERSION.jar" -HMCL_JAR_SHA256=$(curl "$MAVEN_CENTRAL_BASE/org/glavo/hmcl/$HMCL_ARTIFACT_ID/$HMCL_VERSION/$HMCL_ARTIFACT_ID-$HMCL_VERSION.jar.sha256") +HMCL_JAR_URL="$CNB_DOWNLOAD_FILE_URL_BASE.jar" +HMCL_JAR_SHA256=$(curl -fsSL "$HMCL_JAR_URL" | sha256sum | sed 's/ .*//' | tr -d '\n') -HMCL_EXE_URL="https://github.com/HMCL-dev/HMCL/releases/download/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe" -HMCL_EXE_SHA256=$(curl -fsSL "$HMCL_EXE_URL" | sha256sum | awk '{print $1}' | tr -d '\n') +HMCL_EXE_URL="$CNB_DOWNLOAD_FILE_URL_BASE.exe" +HMCL_EXE_SHA256=$(curl -fsSL "$HMCL_EXE_URL" | sha256sum | sed 's/ .*//' | tr -d '\n') + +HMCL_SH_URL="$CNB_DOWNLOAD_FILE_URL_BASE.sh" +HMCL_SH_SHA256=$(curl -fsSL "$HMCL_SH_URL" | sha256sum | sed 's/ .*//' | tr -d '\n') echo "" echo "" cat <<- EOF - "$HMCL_CHANNEL": { + { "version": "$HMCL_VERSION", "jar": { "url": "$HMCL_JAR_URL", "sha256": "$HMCL_JAR_SHA256" }, "exe": { - "url": "https://glavo.lanzouw.com/", + "url": "$HMCL_EXE_URL", "sha256": "$HMCL_EXE_SHA256" - } + }, + "sh": { + "url": "$HMCL_SH_URL", + "sha256": "$HMCL_SH_SHA256" + } } EOF diff --git a/check-update.sh b/check-update.sh index 2987152..ffb9362 100755 --- a/check-update.sh +++ b/check-update.sh @@ -1,44 +1,27 @@ #!/usr/bin/bash -set -e +set -euo pipefail -HMCL_CHANNEL="$1" -HMCL_VERSION="$2" - -case "$HMCL_CHANNEL" in - stable|stable-preview) - HMCL_ARTIFACT_ID="hmcl-stable";; - dev|dev-preview) - HMCL_ARTIFACT_ID="hmcl-dev";; - *) - echo "Unknown channel: $HMCL_CHANNEL" >&2 - exit 1 - ;; -esac - -if [[ "$HMCL_CHANNEL" == "dev-preview" ]]; then - END_CHAR="" -else - END_CHAR="," -fi +HMCL_VERSION="$1" if [[ ! "$HMCL_VERSION" =~ ^3(\.[0-9]+)+$ ]]; then echo "Unsupported version: $HMCL_VERSION" >&2 exit 1 fi -MAVEN_CENTRAL_BASE="http://mirrors.cloud.tencent.com/nexus/repository/maven-public" -HMCL_JAR_URL="$MAVEN_CENTRAL_BASE/org/glavo/hmcl/$HMCL_ARTIFACT_ID/$HMCL_VERSION/$HMCL_ARTIFACT_ID-$HMCL_VERSION.jar" -HMCL_JAR_SHA1=$(curl "https://repo1.maven.org/maven2/org/glavo/hmcl/$HMCL_ARTIFACT_ID/$HMCL_VERSION/$HMCL_ARTIFACT_ID-$HMCL_VERSION.jar.sha1") +CNB_DOWNLOAD_FILE_URL_BASE="https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v$HMCL_VERSION/HMCL-$HMCL_VERSION" + +HMCL_JAR_URL="$CNB_DOWNLOAD_FILE_URL_BASE.jar" +HMCL_JAR_SHA1=$(curl -fsSL "$HMCL_JAR_URL" | sha1sum | sed 's/ .*//' | tr -d '\n') echo "" echo "" cat <<- EOF - "$HMCL_CHANNEL": { + { "jar": "$HMCL_JAR_URL", "jarsha1": "$HMCL_JAR_SHA1", "universal": "https://hmcl.huangyuhui.net", "version": "$HMCL_VERSION" - }$END_CHAR + } EOF diff --git a/download.json b/download.json index 0ba0ebb..8b6df9f 100644 --- a/download.json +++ b/download.json @@ -1,37 +1,46 @@ { "stable": { "version": "3.8.1", + "jar": { + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.8.1/HMCL-3.8.1.jar", + "sha256": "990d22b883954444ddb9e35b7b9b3d5126e2b3a201ea7d1e036133b0ccf21a78" + }, + "exe": { + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.8.1/HMCL-3.8.1.exe", + "sha256": "babd4bd363447d64c925d7775f3cc30ff55f64af450f305f8a29efb44fefd5f2" + }, "sh": { - "url": "https://github.com/HMCL-dev/HMCL/releases/download/v3.8.1/HMCL-3.8.1.sh" + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.8.1/HMCL-3.8.1.sh", + "sha256": "f672fde4e4c2e9a4616a24c5e5d264e18013eb339c0dd05723bdb187494048eb" } }, "dev": { - "version": "3.8.0.310", + "version": "3.9.0.312", "jar": { - "url": "https://mirrors.cloud.tencent.com/nexus/repository/maven-public/org/glavo/hmcl/hmcl-dev/3.8.0.310/hmcl-dev-3.8.0.310.jar", - "sha256": "61efc56f44c33bb1f8af468809e3db96693962a30cac639ddd4a421053aef945" + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.9.0.312/HMCL-3.9.0.312.jar", + "sha256": "c6d7b09e842206990c974f06be494f2c89fa6c59323b3d8facc7c3c9ea32e60b" }, "exe": { - "url": "https://glavo.lanzouw.com/iVv313buq7ud", - "sha256": "df31dc065ca74da63bbbb0f0d8343bbf68c5be72f3d3467044a12a7aa23767bc" + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.9.0.312/HMCL-3.9.0.312.exe", + "sha256": "0e2043d55043fdab1487092d4b3f66cee9fbfe1e8f596b5bd6d80c206613a5cf" }, "sh": { - "url": "https://github.com/HMCL-dev/HMCL/releases/download/v3.8.0.310/HMCL-3.8.0.310.sh", - "sha256": "b739b45281695361d347b9695fae5238cfd317680e7063a139fa8a4988d53317" + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.9.0.312/HMCL-3.9.0.312.sh", + "sha256": "ad2c22a78ae271443e6ca5864313618ca6d4b23fd8440a3b326b94893872099e" } }, "old": { "version": "3.6.20", "jar": { - "url": "https://github.com/HMCL-dev/HMCL/releases/download/v3.6.20/HMCL-3.6.20.jar", + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.6.20/HMCL-3.6.20.jar", "sha256": "691866221c8501e5a79ad61d87afa05019bde0389f867aa8425314d588aae759" }, "exe": { - "url": "https://github.com/HMCL-dev/HMCL/releases/download/v3.6.20/HMCL-3.6.20.exe", + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.6.20/HMCL-3.6.20.exe", "sha256": "f3e65c5d928c8464a9591dfa4ac9075f6f9dbe74fa3e4075ea51b0f71b2612ca" }, "sh": { - "url": "https://github.com/HMCL-dev/HMCL/releases/download/v3.6.20/HMCL-3.6.20.sh", + "url": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.6.20/HMCL-3.6.20.sh", "sha256": "491e11d47c38f3252a80851ecf25c0f84a04c7682be813a264afb54761648226" } } diff --git a/update.json b/update.json index c54b5b2..ab1aa85 100644 --- a/update.json +++ b/update.json @@ -1,12 +1,12 @@ { "stable": { - "jar": "http://mirrors.cloud.tencent.com/nexus/repository/maven-public/org/glavo/hmcl/hmcl-stable/3.8.1/hmcl-stable-3.8.1.jar", + "jar": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.8.1/HMCL-3.8.1.jar", "jarsha1": "592ff6ae4596a5986db2ad4a16163c9138fc9a59", "universal": "https://hmcl.huangyuhui.net", "version": "3.8.1" }, "stable-preview": { - "jar": "http://mirrors.cloud.tencent.com/nexus/repository/maven-public/org/glavo/hmcl/hmcl-stable/3.8.1/hmcl-stable-3.8.1.jar", + "jar": "https://cnb.cool/HMCL-dev/HMCL/-/releases/download/v3.8.1/HMCL-3.8.1.jar", "jarsha1": "592ff6ae4596a5986db2ad4a16163c9138fc9a59", "universal": "https://hmcl.huangyuhui.net", "version": "3.8.1"