Use magick instead of convert if available

This suppresses a warning on more modern systems while preserving the ability of older systems and CI/CD to run the test suite. > WARNING: The convert command is deprecated in IMv7, \ > use "magick" instead of "convert" or "magick convert" Signed-off-by: Matt Jolly <[email protected]>
dillo-browser · Nov 13, 2024 · d26ad8f · d26ad8f
1 parent 3af0530
commit d26ad8f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/test/html/driver.sh b/test/html/driver.sh
@@ -19,6 +19,11 @@ if [ ! -e $DILLOBIN ]; then
   exit 1
 fi
 
+magick_bin="convert"
+if command -v magick 2>&1 >/dev/null; then
+  magick_bin="magick"
+fi
+
 function render_page() {
   htmlfile="$1"
   outpic="$2"
@@ -35,7 +40,7 @@ function render_page() {
     echo "cannot find Dillo window" >&2
     exit 1
   fi
-  xwd -id "$winid" -silent | convert xwd:- png:${outpic}
+  xwd -id "$winid" -silent | ${magick_bin} xwd:- png:${outpic}
 
   kill "$dillopid"
 }