From c25de2a856307a9fffd5e7ce26283b9413cbef13 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 12 Jun 2024 11:19:31 +0200
Subject: Really fix usage of 'magick' instead of 'convert'

This silences the warnings in -current about depreciation of 'convert'
---
 make_slackware_live.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 5532ee7..6ac1175 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -352,7 +352,7 @@ LIVE_MOD_COS=${LIVE_MOD_COS:-"${LIVE_STAGING}/${LIVEMAIN}/core2ram"}
 
 # Internal variables:
 if which magick 1>/dev/null 2>/dev/null ; then
-  MAGICK="magick "
+  MAGICK="magick"
 else
   MAGICK=""
 fi
@@ -1205,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,,}
-  ${MAGICK}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 :
-  ${MAGICK}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
-  ${MAGICK}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 :
-  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK:-convert} ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    ${MAGICK}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
-  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK:-convert} ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    ${MAGICK}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 :
-  ${MAGICK}convert ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
+  ${MAGICK:-convert} ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/${LIVEDE,,}/background.jpg \
     -resize 5120x - | \
-    ${MAGICK}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):
-  ${MAGICK}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
 
@@ -2357,11 +2357,11 @@ else
   # Use the default Slackware blue 'S':
   FACE_ICON="${LIVE_TOOLDIR}/blueSW-64px.png"
 fi
-${MAGICK}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
-${MAGICK}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-80-g2a13