diff --git a/check_downloader.py b/check_downloader.py index a1d71d4..00905be 100755 --- a/check_downloader.py +++ b/check_downloader.py @@ -26,7 +26,7 @@ def download(url: str) -> None: subprocess.run(["curl", "-H", f"User-Agent: {USER_AGENT}", "-fsLo", file_path, url]) -def check_download(name: str, version: str, url: str, arch: str="amd64") -> None: +def check_download(name: str, version: str, url: str, arch: str) -> None: """Check and handle package download/update.""" logging.info("%s:%s = %s", name, arch, version) @@ -67,11 +67,11 @@ def check_download(name: str, version: str, url: str, arch: str="amd64") -> None if __name__ == "__main__": args = sys.argv - if len(args) in (4, 5): + if len(args) == 5: check_download(*args[1:]) elif len(args) > 1: logging.error(f"Unknown Args: {args[1:]}") else: - print(f"Usage: {args[0]} [arch]") + print(f"Usage: {args[0]} ") print("options:") - print(" arch: amd64, arm64, all. default is amd64") + print(" arch: amd64, arm64, all.") diff --git a/get/baidunetdisk.sh b/get/baidunetdisk.sh index 82b6e5b..22f12bb 100644 --- a/get/baidunetdisk.sh +++ b/get/baidunetdisk.sh @@ -1,6 +1,6 @@ JSON=$(curl -s "https://pan.baidu.com/disk/cmsdata?do=client") VERSION=$(echo $JSON | jq -r ".linux.version" | cut -d "V" -f 2) -X64_URL=$(echo $JSON | jq -r ".linux.url_1") +AMD64_URL=$(echo $JSON | jq -r ".linux.url_1") -./check_downloader.py baidunetdisk $VERSION $X64_URL +./check_downloader.py baidunetdisk $VERSION $AMD64_URL amd64 diff --git a/get/browser360-cn-stable.sh b/get/browser360-cn-stable.sh index 168902b..3df3212 100644 --- a/get/browser360-cn-stable.sh +++ b/get/browser360-cn-stable.sh @@ -1,6 +1,6 @@ JSON=$(curl -s https://active.browser.360.net/api/v1/web-version) VERSION=$(echo $JSON | jq -r ".data.web_version") -X64_URL="https://gedown.360safe.com/gc/browser360-cn-stable_"$VERSION"-1_amd64.deb" +AMD64_URL="https://gedown.360safe.com/gc/browser360-cn-stable_"$VERSION"-1_amd64.deb" -./check_downloader.py browser360-cn-stable $VERSION $X64_URL \ No newline at end of file +./check_downloader.py browser360-cn-stable $VERSION $AMD64_URL amd64 \ No newline at end of file diff --git a/get/bytedance-feishu-stable.sh b/get/bytedance-feishu-stable.sh index afb891d..21d0f00 100644 --- a/get/bytedance-feishu-stable.sh +++ b/get/bytedance-feishu-stable.sh @@ -4,7 +4,7 @@ VERSIONS_JSON=$(curl -fs "https://www.feishu.cn/api/downloads") # "version_number": "Linux-x64-deb@V7.22.9" AMD64_VERSION=$(echo $VERSIONS_JSON | jq -r ".versions.Linux_deb_x64.version_number" | cut -d 'V' -f 2) AMD64_URL=$(echo $VERSIONS_JSON | jq -r ".versions.Linux_deb_x64.download_link") -./check_downloader.py bytedance-feishu-stable $AMD64_VERSION $AMD64_URL +./check_downloader.py bytedance-feishu-stable $AMD64_VERSION $AMD64_URL amd64 # ARM64 ARM64_VERSION=$(echo $VERSIONS_JSON | jq -r ".versions.Linux_deb_arm.version_number" | cut -d 'V' -f 2) diff --git a/get/com.alibabainc.dingtalk.sh b/get/com.alibabainc.dingtalk.sh index 7457125..7e4d950 100644 --- a/get/com.alibabainc.dingtalk.sh +++ b/get/com.alibabainc.dingtalk.sh @@ -1,6 +1,6 @@ -X64_URL=$(curl -sw %{redirect_url} https://www.dingtalk.com/win/d/qd=linux_amd64) -VERSION=$(echo $X64_URL | sed 's#.*/##g' | cut -d '_' -f 2) -./check_downloader.py com.alibabainc.dingtalk $VERSION $X64_URL +AMD64_URL=$(curl -sw %{redirect_url} https://www.dingtalk.com/win/d/qd=linux_amd64) +VERSION=$(echo $AMD64_URL | sed 's#.*/##g' | cut -d '_' -f 2) +./check_downloader.py com.alibabainc.dingtalk $VERSION $AMD64_URL amd64 ARM64_URL=$(curl -sw %{redirect_url} https://www.dingtalk.com/win/d/qd=linux_arm64) VERSION=$(echo $ARM64_URL | sed 's#.*/##g' | cut -d '_' -f 2) diff --git a/get/dida.sh b/get/dida.sh index 0254ac7..73211de 100644 --- a/get/dida.sh +++ b/get/dida.sh @@ -1,7 +1,7 @@ -X64_URL=$(curl -sI "https://dida365.com/static/getApp/download?type=linux_deb_x64" | grep location | cut -d ' ' -f 2 | tr -d '\r') +AMD64_URL=$(curl -sI "https://dida365.com/static/getApp/download?type=linux_deb_x64" | grep location | cut -d ' ' -f 2 | tr -d '\r') # https://cdn.dida365.cn/download/linux/linux_deb_x64/dida-6.0.0-amd64.deb -VERSION=$(echo $X64_URL | cut -d "-" -f 2) -./check_downloader.py dida $VERSION $X64_URL +VERSION=$(echo $AMD64_URL | cut -d "-" -f 2) +./check_downloader.py dida $VERSION $AMD64_URL amd64 # ARM64 ARM64_URL=$(curl -sI "https://dida365.com/static/getApp/download?type=linux_deb_arm64" | grep location | cut -d ' ' -f 2 | tr -d '\r') diff --git a/get/qqmusic.sh b/get/qqmusic.sh index 4418fe1..77f46f9 100644 --- a/get/qqmusic.sh +++ b/get/qqmusic.sh @@ -1,6 +1,6 @@ WEB_CONTENT=$(curl -s "https://y.qq.com/download/download.html") VERSION=$(echo $WEB_CONTENT | grep -o "Linux 最新版:[0-9\.]*" | cut -d ':' -f 2) -X64_URL=$(echo $WEB_CONTENT | grep -o "https://[0-9a-z/\._]*amd64\.deb" | head -n 1) +AMD64_URL=$(echo $WEB_CONTENT | grep -o "https://[0-9a-z/\._]*amd64\.deb" | head -n 1) -./check_downloader.py qqmusic $VERSION $X64_URL +./check_downloader.py qqmusic $VERSION $AMD64_URL amd64 diff --git a/get/sunloginclient.sh b/get/sunloginclient.sh index 0bad175..3848d70 100644 --- a/get/sunloginclient.sh +++ b/get/sunloginclient.sh @@ -1,6 +1,6 @@ JSON=$(curl -fs "https://client-webapi.oray.com/softwares/SUNLOGIN_X_LINUX?x64=1") VERSION=$(echo "$JSON" | jq -r '.versionno') -X64_URL=$(echo $JSON | jq -r '.downloadurl') +AMD64_URL=$(echo $JSON | jq -r '.downloadurl') -./check_downloader.py sunloginclient $VERSION $X64_URL \ No newline at end of file +./check_downloader.py sunloginclient $VERSION $AMD64_URL amd64 \ No newline at end of file diff --git a/get/todesk.sh b/get/todesk.sh index b8a0856..771a171 100644 --- a/get/todesk.sh +++ b/get/todesk.sh @@ -1,6 +1,6 @@ -X64_URL=$(curl -s https://www.todesk.com/linux.html | grep -o "https://[0-9a-zA-Z_\/\.\-]*.deb" | head -n 1) -# X64_URL=https:/ /dl.todesk.com/linux/todesk-v4.7.2.0-amd64.deb +AMD64_URL=$(curl -s https://www.todesk.com/linux.html | grep -o "https://[0-9a-zA-Z_\/\.\-]*.deb" | head -n 1) +# AMD64_URL=https:/ /dl.todesk.com/linux/todesk-v4.7.2.0-amd64.deb -VERSION=$(echo $X64_URL | cut -d '-' -f 2) +VERSION=$(echo $AMD64_URL | cut -d '-' -f 2) -./check_downloader.py todesk $VERSION $X64_URL \ No newline at end of file +./check_downloader.py todesk $VERSION $AMD64_URL amd64 \ No newline at end of file diff --git a/get/utools.sh b/get/utools.sh index 49659e8..5dc7c4e 100644 --- a/get/utools.sh +++ b/get/utools.sh @@ -1,8 +1,8 @@ WEB_CONTENT=$(curl -s "https://www.u-tools.cn/download/") -X64_URL=$(echo $WEB_CONTENT | grep -o "https://[^ ]*amd64\.deb") +AMD64_URL=$(echo $WEB_CONTENT | grep -o "https://[^ ]*amd64\.deb") # https://open.u-tools.cn/download/utools_5.2.1_amd64.deb -VERSION=$(echo $X64_URL | cut -d '_' -f 2) +VERSION=$(echo $AMD64_URL | cut -d '_' -f 2) -./check_downloader.py utools $VERSION $X64_URL +./check_downloader.py utools $VERSION $AMD64_URL amd64 diff --git a/get/wechat.sh b/get/wechat.sh index 608b016..338dc23 100644 --- a/get/wechat.sh +++ b/get/wechat.sh @@ -1,13 +1,13 @@ WEB_CONTENT=$(curl -s "https://linux.weixin.qq.com/") -# X64 -X64_URL=$(echo $WEB_CONTENT | grep -o 'https:[0-9a-zA-Z/\._]*x86_64\.deb') -Last_Modified=$(curl -sI $X64_URL | grep "Last-Modified") +# AMD64 +AMD64_URL=$(echo $WEB_CONTENT | grep -o 'https:[0-9a-zA-Z/\._]*x86_64\.deb') +Last_Modified=$(curl -sI $AMD64_URL | grep "Last-Modified") # Last-Modified: Wed, 06 Nov 2024 02:08:50 GMT VERSION=$(echo $Last_Modified | cut -d ' ' -f 3-6 | sed 's/ /-/g') # 06-Nov-2024-02:08:50 -./check_downloader.py wechat $VERSION $X64_URL +./check_downloader.py wechat $VERSION $AMD64_URL amd64 # ARM64 ARM64_URL=$(echo $WEB_CONTENT | grep -o 'https:[0-9a-zA-Z/\._]*arm64\.deb') diff --git a/get/wemeet.sh b/get/wemeet.sh index 05f6a7e..afb52d9 100644 --- a/get/wemeet.sh +++ b/get/wemeet.sh @@ -13,8 +13,8 @@ download_list_url="https://meeting.tencent.com/web-service/query-download-info?q JSON=$(curl -s $download_list_url) VERSION=$(echo $JSON | jq -r '."info-list"[0].version') -X64_URL=$(echo $JSON | jq -r '."info-list"[0].url') -./check_downloader.py wemeet $VERSION $X64_URL +AMD64_URL=$(echo $JSON | jq -r '."info-list"[0].url') +./check_downloader.py wemeet $VERSION $AMD64_URL amd64 # ARM64 VERSION=$(echo $JSON | jq -r '."info-list"[1].version') diff --git a/get/xmind-vana.sh b/get/xmind-vana.sh index 041bccb..4b4aca4 100644 --- a/get/xmind-vana.sh +++ b/get/xmind-vana.sh @@ -1,6 +1,6 @@ -X64_URL=$(curl -sI "https://xmind.cn/zen/download/linux_deb/" | grep location | cut -d ' ' -f 2 | tr -d '\r') +AMD64_URL=$(curl -sI "https://xmind.cn/zen/download/linux_deb/" | grep location | cut -d ' ' -f 2 | tr -d '\r') # https://dl3.xmind.cn/Xmind-for-Linux-amd64bit-24.04.10311-202405240010.deb -VERSION=$(echo $X64_URL | cut -d '-' -f 5) +VERSION=$(echo $AMD64_URL | cut -d '-' -f 5) -./check_downloader.py xmind-vana $VERSION $X64_URL +./check_downloader.py xmind-vana $VERSION $AMD64_URL amd64