From 0c2b7dc4b51e922f1541de744bb74d2dcab8323e Mon Sep 17 00:00:00 2001 From: YuCat-OVO <66810215+YuCat-OVO@users.noreply.github.com> Date: Sat, 2 Mar 2024 17:17:45 +0800 Subject: [PATCH] change --- Dockerfile | 21 ++++++++++++--------- info.json | 12 ++++++------ url.json | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6fcad8c..a9c3b18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,11 @@ ENV \ HOME="/config" \ TITLE="Baidunetdisk" -COPY info.json /tmp/ +COPY url.json /tmp/ RUN \ - TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} &&\ - echo "**** arch: ${TARGETPLATFORM} ****" &&\ + TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} && \ + echo "**** arch: ${TARGETPLATFORM} ****" && \ echo "**** add icon ****" && \ curl -o \ /kclient/public/icon.png \ @@ -35,13 +35,16 @@ RUN \ fonts-wqy-zenhei \ desktop-file-utils && \ echo "**** install BaiduNetdisk ****" && \ - if [ ${TARGETPLATFORM} == linux/amd64 ]; then \ - BAIDUNETDISK_VERSION=$(jq -r '.[1] | "\(.version)"' /tmp/info.json); \ - BAIDUNETDISK_URL=$(jq -r '.[1] | "\(.url)"' /tmp/info.json); \ - elif [ ${TARGETPLATFORM} == linux/arm64 ]; then \ - BAIDUNETDISK_VERSION=$(jq -r '.[2] | "\(.version)"' /tmp/info.json); \ - BAIDUNETDISK_URL=$(jq -r '.[2] | "\(.url)"' /tmp/info.json); \ + if [ "${TARGETPLATFORM}" == "linux/amd64" ]; then \ + echo "**** ${TARGETPLATFORM}, reading from url.json ****"; \ + BAIDUNETDISK_VERSION=$(jq -r ".[-2]" /tmp/url.json); \ + BAIDUNETDISK_URL=$(jq -r ".[-2]" /tmp/url.json); \ + elif [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \ + echo "**** ${TARGETPLATFORM}, reading from url.json ****"; \ + BAIDUNETDISK_VERSION=$(jq -r ".[-1]" /tmp/url.json); \ + BAIDUNETDISK_URL=$(jq -r ".[-1]" /tmp/url.json); \ else \ + echo "**** err, use default url ****" && \ BAIDUNETDISK_URL="https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.17.7/baidunetdisk_4.17.7_amd64.deb"; \ fi && \ echo "***** Getting ${BAIDUNETDISK_URL} ****" && \ diff --git a/info.json b/info.json index fa20d6c..11b3a2f 100644 --- a/info.json +++ b/info.json @@ -1,16 +1,16 @@ [ - { - "arch": "x86_64", - "pak": "rpm", - "url": "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.11.5/baidunetdisk-4.11.5.x86_64.rpm", - "version": "4.11.5" - }, { "arch": "amd64", "pak": "deb", "url": "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.11.5/baidunetdisk_4.11.5_amd64.deb", "version": "4.11.5" }, + { + "arch": "amd64", + "pak": "deb", + "url": "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.17.7/baidunetdisk_4.17.7_amd64.deb", + "version": "4.17.7" + }, { "arch": "arm64", "pak": "deb", diff --git a/url.json b/url.json index 39a6446..771552e 100644 --- a/url.json +++ b/url.json @@ -5,5 +5,6 @@ "https://issuepcdn.baidupcs.com/issue/netdisk/MACguanjia/BaiduNetdisk_mac_4.11.0_arm64.dmg", "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.11.5/baidunetdisk-4.11.5.x86_64.rpm", "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.11.5/baidunetdisk_4.11.5_amd64.deb", + "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.17.7/baidunetdisk_4.17.7_amd64.deb", "https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/4.17.7/baidunetdisk_4.17.7_arm64.deb" ] \ No newline at end of file