From ad04f175bbeea0e42841e2bd43e88fd0f0802e4e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 30 Jul 2023 13:26:01 +0200 Subject: [PATCH] Fix ImageMagick download --- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index a336fd6..38f9bec 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,7 +59,7 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] - subdirs = ["pictrs-data", "sled", "exports"] + subdirs = ["pictrs-data", "sled", "exports", "magick"] [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index 0928e10..a0506f4 100755 --- a/scripts/install +++ b/scripts/install @@ -91,7 +91,7 @@ chown -R $app:$app "$install_dir" # (Dirty) Install ImageMagick # Requires 'libfuse2' and 'libimage-exiftool-perl' apt dependencies -wget https://imagemagick.org/archive/binaries/magick -O "$install_dir/pict-rs/magick" -q +curl -f https://imagemagick.org/archive/binaries/magick -o "$install_dir/pict-rs/magick" -s [ ! -f "$install_dir/pict-rs/magick" ] && ynh_print_err --message="ImageMagick could not be downloaded" chmod 750 "$install_dir/pict-rs/magick" chown $app:$app "$install_dir/pict-rs/magick" diff --git a/scripts/upgrade b/scripts/upgrade index e863952..18fb23b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,7 +130,7 @@ then # (Dirty) Install ImageMagick # Requires 'libfuse2' and 'libimage-exiftool-perl' apt dependencies - wget https://imagemagick.org/archive/binaries/magick -O "$install_dir/pict-rs/magick" -q + curl -f https://imagemagick.org/archive/binaries/magick -o "$install_dir/pict-rs/magick" -s [ ! -f "$install_dir/pict-rs/magick" ] && ynh_print_err --message="ImageMagick could not be downloaded" chmod 750 "$install_dir/pict-rs/magick" chown $app:$app "$install_dir/pict-rs/magick"