diff --git a/get-deps-macos.sh b/get-deps-macos.sh index 41b8e95..ab99d4a 100755 --- a/get-deps-macos.sh +++ b/get-deps-macos.sh @@ -12,23 +12,23 @@ rm -rf magick-src mkdir magick-src cd magick-src -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-54.tar.gz +curl --retry 5 -O -L https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-54.tar.gz tar xvzf 7.1.0-54.tar.gz cd ImageMagick-7.1.0-54 -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://download.imagemagick.org/archive/delegates/jpegsrc.v9b.tar.gz +curl --retry 5 -O -L https://download.imagemagick.org/archive/delegates/jpegsrc.v9b.tar.gz tar xvzf jpegsrc.v9b.tar.gz cd jpeg-9b ./configure --enable-static --disable-shared --prefix=$MAGICK_HOME/lib/libjpeg cd .. -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://download.imagemagick.org/archive/delegates/libwebp-0.6.0.tar.gz +curl --retry 5 -O -L https://download.imagemagick.org/archive/delegates/libwebp-0.6.0.tar.gz tar xvzf libwebp-0.6.0.tar.gz cd libwebp-0.6.0 ./configure --enable-static --disable-shared --prefix=$MAGICK_HOME/lib/libwebp cd .. -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://download.imagemagick.org/archive/delegates/libpng-1.6.31.tar.gz +curl --retry 5 -O -L https://download.imagemagick.org/archive/delegates/libpng-1.6.31.tar.gz tar xvzf libpng-1.6.31.tar.gz cd libpng-1.6.31 ./configure --enable-static --disable-shared --prefix=$MAGICK_HOME/lib/libpng @@ -56,7 +56,7 @@ cd ./sticker_convert/bin # Compiling pngnq-s9 mkdir ./pngnqs9 cd ./pngnqs9 -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://github.com/ImageProcessing-ElectronicPublications/pngnq-s9/archive/refs/tags/2.0.2.tar.gz +curl --retry 5 -O -L https://github.com/ImageProcessing-ElectronicPublications/pngnq-s9/archive/refs/tags/2.0.2.tar.gz tar xvzf 2.0.2.tar.gz cd ./pngnq-s9-2.0.2 # Fix bug that causes compilation to fail @@ -74,7 +74,7 @@ rm -rf ./pngnqs9 # Get pngquant mkdir pngquant-dl cd pngquant-dl -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://pngquant.org/pngquant.tar.bz2" +curl --retry 5 -O -L "https://pngquant.org/pngquant.tar.bz2" tar xvzf pngquant.tar.bz2 cd ../ cp ./pngquant-dl/pngquant ./ @@ -93,24 +93,24 @@ rm -rf ./optipng-dl rm optipng.tar.gz # Get apngasm -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://sourceforge.net/projects/apngasm/files/2.91/apngasm-2.91-bin-macos.zip +curl --retry 5 -O -L https://sourceforge.net/projects/apngasm/files/2.91/apngasm-2.91-bin-macos.zip unzip apngasm-2.91-bin-macos.zip rm readme.txt rm apngasm-2.91-bin-macos.zip # Get apngdis -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://sourceforge.net/projects/apngdis/files/2.9/apngdis-2.9-bin-macos.zip +curl --retry 5 -O -L https://sourceforge.net/projects/apngdis/files/2.9/apngdis-2.9-bin-macos.zip unzip apngdis-2.9-bin-macos.zip rm readme.txt rm apngdis-2.9-bin-macos.zip # Get ffmpeg -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://evermeet.cx/ffmpeg/ffmpeg-5.1.2.zip +curl --retry 5 -O -L https://evermeet.cx/ffmpeg/ffmpeg-5.1.2.zip unzip ffmpeg-5.1.2.zip rm ffmpeg-5.1.2.zip # Get ffprobe -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L https://evermeet.cx/ffmpeg/ffprobe-5.1.2.zip +curl --retry 5 -O -L https://evermeet.cx/ffmpeg/ffprobe-5.1.2.zip unzip ffprobe-5.1.2.zip rm ffprobe-5.1.2.zip diff --git a/get-deps-windows.bat b/get-deps-windows.bat index 314157d..db1d393 100644 --- a/get-deps-windows.bat +++ b/get-deps-windows.bat @@ -9,32 +9,32 @@ rd /s /q sticker_convert\ImageMagick >nul 2>&1 :: Get ImageMagick mkdir ImageMagick cd .\ImageMagick -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://imagemagick.org/archive/binaries/ImageMagick-7.1.0-54-portable-Q16-x64.zip" +curl --retry 5 -O -L "https://imagemagick.org/archive/binaries/ImageMagick-7.1.0-54-portable-Q16-x64.zip" tar -xf ImageMagick-7.1.0-54-portable-Q16-x64.zip del ImageMagick-7.1.0-54-portable-Q16-x64.zip cd .. :: Get apngasm -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://github.com/laggykiller/apngasm/releases/download/3.1.3/apngasm_3.1-3_AMD64.zip" +curl --retry 5 -O -L "https://github.com/laggykiller/apngasm/releases/download/3.1.3/apngasm_3.1-3_AMD64.zip" tar -xf apngasm_3.1-3_AMD64.zip del apngasm_3.1-3_AMD64.zip :: Get apngdis cd bin -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://sourceforge.net/projects/apngdis/files/2.9/apngdis-2.9-bin-win64.zip" +curl --retry 5 -O -L "https://sourceforge.net/projects/apngdis/files/2.9/apngdis-2.9-bin-win64.zip" tar -xf apngdis-2.9-bin-win64.zip del apngdis-2.9-bin-win64.zip del readme.txt :: Get pngnq-s9 -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://sourceforge.net/projects/pngnqs9/files/pngnq-s9-2.0.2.zip" +curl --retry 5 -O -L "https://sourceforge.net/projects/pngnqs9/files/pngnq-s9-2.0.2.zip" tar -xf pngnq-s9-2.0.2.zip move pngnq-s9-2.0.2\pngnq-s9.exe . del pngnq-s9-2.0.2.zip rd /s /q pngnq-s9-2.0.2 :: Get optipng -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://sourceforge.net/projects/optipng/files/OptiPNG/optipng-0.7.7/optipng-0.7.7-win32.zip" +curl --retry 5 -O -L "https://sourceforge.net/projects/optipng/files/OptiPNG/optipng-0.7.7/optipng-0.7.7-win32.zip" tar -xf optipng-0.7.7-win32.zip move optipng-0.7.7-win32\optipng.exe . del optipng-0.7.7-win32.zip @@ -43,7 +43,7 @@ rd /s /q optipng-0.7.7-win32 :: Get pngquant mkdir pngquant-dl cd pngquant-dl -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://pngquant.org/pngquant-windows.zip" +curl --retry 5 -O -L "https://pngquant.org/pngquant-windows.zip" tar -xf pngquant-windows.zip cd .. move pngquant-dl\pngquant\pngquant.exe . @@ -52,7 +52,7 @@ rd /s /q pngquant-dl :: Get ffmpeg mkdir ffmpeg-dl cd ffmpeg-dl -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip" +curl --retry 5 -O -L "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip" tar -xf ffmpeg-master-latest-win64-gpl.zip cd .. move ffmpeg-dl\ffmpeg-master-latest-win64-gpl\bin\ffmpeg.exe . @@ -62,7 +62,7 @@ rd /s /q ffmpeg-dl :: Get bzip2 mkdir bzip2-dl cd bzip2-dl -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "https://sourceforge.net/projects/gnuwin32/files/bzip2/1.0.5/bzip2-1.0.5-bin.zip" +curl --retry 5 -O -L "https://sourceforge.net/projects/gnuwin32/files/bzip2/1.0.5/bzip2-1.0.5-bin.zip" tar -xf bzip2-1.0.5-bin.zip cd .. move bzip2-dl\bin\* . @@ -71,7 +71,7 @@ rd /s /q bzip2-dl :: Get zip mkdir zip-dl cd zip-dl -curl --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 40 -O -L "http://downloads.sourceforge.net/gnuwin32/zip-3.0-bin.zip" +curl --retry 5 -O -L "http://downloads.sourceforge.net/gnuwin32/zip-3.0-bin.zip" tar -xf zip-3.0-bin.zip cd .. move zip-dl\bin\* .