diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63a30cf..48a2957 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,7 +181,9 @@ jobs: path: version.txt - name: Get Deps run: | + chmod +x aria2.sh chmod +x ffmpeg.sh + ./aria2.sh osx-${{ matrix.cpu }} ./ffmpeg.sh mac ${{ matrix.cpu }} working-directory: ./script - name: Build ${{ matrix.cpu }} diff --git a/DownKyi.Core/Binary/osx-arm64/aria2/aria2c b/DownKyi.Core/Binary/osx-arm64/aria2/aria2c deleted file mode 100755 index 2134b8d..0000000 Binary files a/DownKyi.Core/Binary/osx-arm64/aria2/aria2c and /dev/null differ diff --git a/DownKyi.Core/Binary/osx-x64/aria2/aria2c b/DownKyi.Core/Binary/osx-x64/aria2/aria2c deleted file mode 100755 index 31ba644..0000000 Binary files a/DownKyi.Core/Binary/osx-x64/aria2/aria2c and /dev/null differ diff --git a/script/aria2.sh b/script/aria2.sh index 0fa15e9..6b720ce 100644 --- a/script/aria2.sh +++ b/script/aria2.sh @@ -18,17 +18,26 @@ download_aria2() { case $1 in linux-x64) save="$save_path/$1/aria2" - download_url="https://github.com/abcfy2/aria2-static-build/releases/download/1.37.0/aria2-x86_64-linux-musl_static.zip" + download_url="https://github.com/yaobiao131/downkyi-aria2-static-build/releases/download/1.37.0/aria2-x86_64-linux-musl_static.zip" ;; linux-arm64) save="$save_path/$1/aria2" - download_url="https://github.com/abcfy2/aria2-static-build/releases/download/1.37.0/aria2-aarch64-linux-musl_static.zip" + download_url="https://github.com/yaobiao131/downkyi-aria2-static-build/releases/download/1.37.0/aria2-aarch64-linux-musl_static.zip" + ;; + osx-x64) + save="$save_path/$1/aria2" + download_url="https://github.com/yaobiao131/downkyi-aria2-static-build/releases/download/1.37.0/aria2-x86_64-apple-darwin_static.zip" + ;; + osx-arm64) + save="$save_path/$1/aria2" + download_url="https://github.com/yaobiao131/downkyi-aria2-static-build/releases/download/1.37.0/aria2-aarch64-apple-darwin_static.zip" ;; esac curl -kL "$download_url" -o "$download_dir/aria2.zip" create_dir "$save" - unzip -d "$save" "$download_dir/aria2.zip" + unzip -o -d "$save" "$download_dir/aria2.zip" + chmod +x "$save/aria2c" } download_aria2 "$@" diff --git a/script/macos/package.sh b/script/macos/package.sh old mode 100755 new mode 100644