diff --git a/script/ffmpeg.ps1 b/script/ffmpeg.ps1 index 7a03a13..d2742fb 100644 --- a/script/ffmpeg.ps1 +++ b/script/ffmpeg.ps1 @@ -6,27 +6,18 @@ function Create-Dir($dir) { } Create-Dir ".\downloads" - $url=""; $dir=""; if ($arch -eq "x86") { - $url="https://github.com/sudo-nautilus/FFmpeg-Builds-Win32/releases/download/latest/ffmpeg-n4.4-latest-win32-gpl-4.4.zip"; - $dir="ffmpeg-n4.4-latest-win32-gpl-4.4" + $url="https://github.com/yaobiao131/downkyi-ffmpeg-build/releases/download/continuous/ffmpeg-i686-w64-mingw32_static.zip"; } if ($arch -eq "x64") { - $url="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n4.4-latest-win64-gpl-4.4.zip"; - $dir="ffmpeg-n4.4-latest-win64-gpl-4.4" + $url="https://github.com/yaobiao131/downkyi-ffmpeg-build/releases/download/continuous/ffmpeg-x86_64-w64-mingw32_static.zip"; } Start-BitsTransfer -Source $url -Destination ".\downloads\ffmpeg-$arch.zip"; $destDir="..\DownKyi.Core\Binary\win-$arch\ffmpeg\"; -Expand-Archive -Path ".\downloads\ffmpeg-$arch.zip" -DestinationPath ".\ffmpeg" -Force -Create-Dir $destDir - -Copy-Item ".\ffmpeg\$dir\bin\ffmpeg.exe" "$destDir\ffmpeg.exe" -Force -Copy-Item ".\ffmpeg\$dir\LICENSE.txt" "$destDir\LICENSE.txt" -Force - -Remove-Item ".\ffmpeg" -Recurse -Force \ No newline at end of file +Expand-Archive -Path ".\downloads\ffmpeg-$arch.zip" -DestinationPath $destDir -Force diff --git a/script/ffmpeg.sh b/script/ffmpeg.sh index 4907c28..04ea8a5 100755 --- a/script/ffmpeg.sh +++ b/script/ffmpeg.sh @@ -13,19 +13,34 @@ create_dir() { create_dir "$download_dir" -version="b4.4.1" - download_ffmpeg_macos() { - local url="https://github.com/eugeneware/ffmpeg-static/releases/download/${version}/darwin-$arch" + local filename="" + case $arch in + x64) + filename=ffmpeg-x86_64-apple-darwin_static.zip + ;; + arm64) + filename=ffmpeg-aarch64-apple-darwin_static.zip + ;; + esac + local url="https://github.com/yaobiao131/downkyi-ffmpeg-build/releases/download/continuous/$filename" create_dir "$ffmpeg_save_path/osx-$arch/ffmpeg" - curl -kL "$url" -o "$ffmpeg_save_path/osx-$arch/ffmpeg/ffmpeg" + curl -kL "$url" -o "$download_dir/ffmpeg.zip" + unzip -d "$ffmpeg_save_path/osx-$arch/ffmpeg/" -o "$download_dir/ffmpeg.zip" chmod +x "$ffmpeg_save_path/osx-$arch/ffmpeg/ffmpeg" } download_ffmpeg_linux() { - local url="https://github.com/eugeneware/ffmpeg-static/releases/download/${version}/linux-$arch" + local filename="" + case $arch in + x64) + filename=ffmpeg-x86_64-linux-musl_static.zip + ;; + esac + local url="https://github.com/yaobiao131/downkyi-ffmpeg-build/releases/download/continuous/$filename" create_dir "$ffmpeg_save_path/linux-$arch/ffmpeg" - curl -kL "$url" -o "$ffmpeg_save_path/linux-$arch/ffmpeg/ffmpeg" + curl -kL "$url" -o "$download_dir/ffmpeg.zip" + unzip -d "$ffmpeg_save_path/linux-$arch/ffmpeg/" -o "$download_dir/ffmpeg.zip" chmod +x "$ffmpeg_save_path/linux-$arch/ffmpeg/ffmpeg" }