From c801c1fb111cb61b15c4457d0a26354db2525c5a Mon Sep 17 00:00:00 2001
From: deepend-tildeclub <deepend@tilde.club>
Date: Fri, 27 Mar 2026 17:56:03 -0600
Subject: [PATCH] Make magick cmd available across CI envs

---
 .github/workflows/appimage-build.yml        | 4 ++++
 .github/workflows/flatpak-build.yml         | 4 ++++
 .github/workflows/manjaro-package-build.yml | 4 ++++
 .github/workflows/windows-build.yml         | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/.github/workflows/appimage-build.yml b/.github/workflows/appimage-build.yml
index 0ca5db56..917172d7 100644
--- a/.github/workflows/appimage-build.yml
+++ b/.github/workflows/appimage-build.yml
@@ -38,6 +38,10 @@ jobs:
             perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
             fonts-noto-color-emoji breeze-gtk-theme \
             patchelf file curl imagemagick
+          if ! command -v magick >/dev/null 2>&1 && command -v convert >/dev/null 2>&1; then
+            printf '%s\n' '#!/bin/sh' 'exec convert "$@"' | sudo tee /usr/local/bin/magick >/dev/null
+            sudo chmod +x /usr/local/bin/magick
+          fi
 
       - name: Configure
         run: |
diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml
index 253114ce..465907c4 100644
--- a/.github/workflows/flatpak-build.yml
+++ b/.github/workflows/flatpak-build.yml
@@ -29,6 +29,10 @@ jobs:
         run: |
           apt-get update
           apt-get install -y --no-install-recommends imagemagick
+          if ! command -v magick >/dev/null 2>&1 && command -v convert >/dev/null 2>&1; then
+            printf '%s\n' '#!/bin/sh' 'exec convert "$@"' > /usr/local/bin/magick
+            chmod +x /usr/local/bin/magick
+          fi
 
       - name: Build Flatpak
         id: flatpak_builder
diff --git a/.github/workflows/manjaro-package-build.yml b/.github/workflows/manjaro-package-build.yml
index 439c8ece..5477a711 100644
--- a/.github/workflows/manjaro-package-build.yml
+++ b/.github/workflows/manjaro-package-build.yml
@@ -43,6 +43,10 @@ jobs:
             python-cffi \
             pciutils \
             imagemagick
+          if ! command -v magick >/dev/null 2>&1 && command -v convert >/dev/null 2>&1; then
+            printf '%s\n' '#!/bin/sh' 'exec convert "$@"' > /usr/local/bin/magick
+            chmod +x /usr/local/bin/magick
+          fi
 
       - name: Checkout repository
         uses: actions/checkout@v5
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index bbd4d878..e939ca4c 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -40,6 +40,12 @@ jobs:
           python -m pip install cffi
           python -m pip install zstandard
           choco install imagemagick -y --no-progress
+          if (-not (Get-Command magick -ErrorAction SilentlyContinue)) {
+            $magickDir = Get-ChildItem 'C:\Program Files\ImageMagick-*' -Directory -ErrorAction SilentlyContinue | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+            if ($magickDir) {
+              $magickDir.FullName | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+            }
+          }
 
           $ProgressPreference = 'SilentlyContinue'
           function Download-WithRetry {