From e6e135ac9b3a0d9148eaac99dc822f6c6805a5ad Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 12 Jun 2024 11:06:37 +0200
Subject: Check if 'magick' command exists and use it then instead of 'convert'

---
 make_slackware_live.sh | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 7255bdd..5532ee7 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -346,6 +346,17 @@ LIVE_MOD_ADD=${LIVE_MOD_ADD:-"${LIVE_STAGING}/${LIVEMAIN}/addons"}
 LIVE_MOD_OPT=${LIVE_MOD_OPT:-"${LIVE_STAGING}/${LIVEMAIN}/optional"}
 LIVE_MOD_COS=${LIVE_MOD_COS:-"${LIVE_STAGING}/${LIVEMAIN}/core2ram"}
 
+#
+# ---------------------------------------------------------------------------
+#
+
+# Internal variables:
+if which magick 1>/dev/null 2>/dev/null ; then
+  MAGICK="magick "
+else
+  MAGICK=""
+fi
+
 # ---------------------------------------------------------------------------
 # Define some functions.
 # ---------------------------------------------------------------------------
@@ -1194,36 +1205,36 @@ function plasma5_custom_bg() {
   echo "-- Configuring ${LIVEDE} custom background image."
   # First convert our image into a JPG in the liveslak directory:
   mkdir -p ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}
-  convert ${LIVE_TOOLDIR}/media/${LIVEDE,,}/bg/background.* ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg
+  ${MAGICK}convert ${LIVE_TOOLDIR}/media/${LIVEDE,,}/bg/background.* ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg
 
   # Create a Plasma5 desktop wallpaper set with a lowercase LIVEDE name:
   mkdir -p ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images
 
   # Create set of images for common aspect ratios like 16:9, 16:10 and 4:3:
   # Aspect Ratio 16:9 :
-  convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 1920x1080 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images/1920x1080.jpg
-  convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x2880 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images/5120x2880.jpg
   # Aspect Ratio 16:10 :
-  convert  ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    convert - -geometry 1920x1200^ -gravity center -crop 1920x1200+0+0 \
+    ${MAGICK}convert - -geometry 1920x1200^ -gravity center -crop 1920x1200+0+0 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images/1920x1200.jpg
-  convert  ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    convert - -geometry 1280x800^ -gravity center -crop 1280x800+0+0 \
+    ${MAGICK}convert - -geometry 1280x800^ -gravity center -crop 1280x800+0+0 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images/1280x800.jpg
   # Aspect Ratio 4:3 :
-  convert  ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    convert - -geometry 1024x768^ -gravity center -crop 1024x768+0+0 \
+    ${MAGICK}convert - -geometry 1024x768^ -gravity center -crop 1024x768+0+0 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/images/1024x768.jpg
 
   # Create the required wallpaper screenshot of 400x225 px (16:9 aspect ratio):
-  convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 400x225 \
     ${LIVE_ROOTDIR}/usr/share/wallpapers/${LIVEDE,,}/contents/screenshot.png
 
@@ -2346,11 +2357,11 @@ else
   # Use the default Slackware blue 'S':
   FACE_ICON="${LIVE_TOOLDIR}/blueSW-64px.png"
 fi
-convert ${FACE_ICON} -resize 64x64 - >${LIVE_ROOTDIR}/home/${LIVEUID}/.face.icon
+${MAGICK}convert ${FACE_ICON} -resize 64x64 - >${LIVE_ROOTDIR}/home/${LIVEUID}/.face.icon
 chown --reference=${LIVE_ROOTDIR}/home/${LIVEUID} ${LIVE_ROOTDIR}/home/${LIVEUID}/.face.icon
 ( cd ${LIVE_ROOTDIR}/home/${LIVEUID}/ ; ln .face.icon .face )
 mkdir -p ${LIVE_ROOTDIR}/usr/share/apps/kdm/pics/users
-convert ${FACE_ICON} -resize 64x64 - >${LIVE_ROOTDIR}/usr/share/apps/kdm/pics/users/blues.icon
+${MAGICK}convert ${FACE_ICON} -resize 64x64 - >${LIVE_ROOTDIR}/usr/share/apps/kdm/pics/users/blues.icon
 
 # Give XDM a nicer look:
 mkdir -p ${LIVE_ROOTDIR}/etc/X11/xdm/liveslak-xdm
-- 
cgit v1.2.3-65-gdbad