Compare commits

...

1 Commits

Author SHA1 Message Date
MickLesk 028c1d16cd ImageMagick: Switch to github releases 2026-06-30 10:11:23 +02:00
+6 -19
View File
@@ -6164,7 +6164,6 @@ _setup_gpu_permissions() {
# - Requires: build-essential, libtool, libjpeg-dev, libpng-dev, etc. # - Requires: build-essential, libtool, libjpeg-dev, libpng-dev, etc.
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
setup_imagemagick() { setup_imagemagick() {
local TMP_DIR=$(mktemp -d)
local BINARY_PATH="/usr/local/bin/magick" local BINARY_PATH="/usr/local/bin/magick"
# Get currently installed version # Get currently installed version
@@ -6195,51 +6194,39 @@ setup_imagemagick() {
pkg-config \ pkg-config \
ghostscript ghostscript
if ! CURL_TIMEOUT=180 curl_with_retry "https://imagemagick.org/archive/ImageMagick.tar.gz" "$TMP_DIR/ImageMagick.tar.gz"; then # Fetch and deploy source tarball from GitHub Releases
msg_error "Failed to download ImageMagick" fetch_and_deploy_gh_release "imagemagick" "ImageMagick/ImageMagick" "tarball" || {
msg_error "Hint: Check connectivity to imagemagick.org/archive" msg_error "Failed to download ImageMagick source from GitHub"
rm -rf "$TMP_DIR" msg_error "Hint: Check connectivity to github.com/ImageMagick/ImageMagick"
return 250 return 250
fi
tar -xzf "$TMP_DIR/ImageMagick.tar.gz" -C "$TMP_DIR" || {
msg_error "Failed to extract ImageMagick"
rm -rf "$TMP_DIR"
return 251
} }
cd "$TMP_DIR"/ImageMagick-* || { cd /opt/imagemagick || {
msg_error "Source extraction failed" msg_error "Failed to enter ImageMagick source directory"
rm -rf "$TMP_DIR"
return 251 return 251
} }
$STD ./configure --disable-static || { $STD ./configure --disable-static || {
msg_error "ImageMagick configure failed" msg_error "ImageMagick configure failed"
rm -rf "$TMP_DIR"
return 150 return 150
} }
$STD make -j"$(nproc)" || { $STD make -j"$(nproc)" || {
msg_error "ImageMagick compilation failed" msg_error "ImageMagick compilation failed"
rm -rf "$TMP_DIR"
return 150 return 150
} }
$STD make install || { $STD make install || {
msg_error "ImageMagick installation failed" msg_error "ImageMagick installation failed"
rm -rf "$TMP_DIR"
return 150 return 150
} }
$STD ldconfig /usr/local/lib $STD ldconfig /usr/local/lib
if [[ ! -x "$BINARY_PATH" ]]; then if [[ ! -x "$BINARY_PATH" ]]; then
msg_error "ImageMagick installation failed" msg_error "ImageMagick installation failed"
rm -rf "$TMP_DIR"
return 150 return 150
fi fi
local FINAL_VERSION local FINAL_VERSION
FINAL_VERSION=$("$BINARY_PATH" -version | awk '/^Version/ {print $3}') FINAL_VERSION=$("$BINARY_PATH" -version | awk '/^Version/ {print $3}')
rm -rf "$TMP_DIR"
cache_installed_version "imagemagick" "$FINAL_VERSION" cache_installed_version "imagemagick" "$FINAL_VERSION"
ensure_usr_local_bin_persist ensure_usr_local_bin_persist