mirror of
https://github.com/vinceliuice/grub2-themes.git
synced 2026-09-05 06:02:46 +08:00
Merge pull request #251 from Alexander-Hou/fix-imagemagick-v6-compat
fix: use convert as fallback for imagemagick v6
This commit is contained in:
+9
-2
@@ -1,5 +1,12 @@
|
|||||||
#! /usr/bin/env bash
|
#! /usr/bin/env bash
|
||||||
|
|
||||||
|
# Define which command to use for ImageMagick
|
||||||
|
if command -v magick &> /dev/null; then
|
||||||
|
_MAGICK="magick"
|
||||||
|
else
|
||||||
|
_MAGICK="convert"
|
||||||
|
fi
|
||||||
|
|
||||||
# Exit Immediately if a command fails
|
# Exit Immediately if a command fails
|
||||||
set -o errexit
|
set -o errexit
|
||||||
|
|
||||||
@@ -127,7 +134,7 @@ generate() {
|
|||||||
sed -i "s/[0-9]\+x[0-9]\+/${custom_resolution}/" "${THEME_DIR}/${theme}/theme.txt"
|
sed -i "s/[0-9]\+x[0-9]\+/${custom_resolution}/" "${THEME_DIR}/${theme}/theme.txt"
|
||||||
# Use appropriate background as base and resize it
|
# Use appropriate background as base and resize it
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${asset_type}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${asset_type}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
||||||
magick "${THEME_DIR}/${theme}/background.jpg" -resize ${custom_resolution}^ -gravity center -extent ${custom_resolution} "${THEME_DIR}/${theme}/background.jpg"
|
"${_MAGICK}" "${THEME_DIR}/${theme}/background.jpg" -resize ${custom_resolution}^ -gravity center -extent ${custom_resolution} "${THEME_DIR}/${theme}/background.jpg"
|
||||||
else
|
else
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${theme}/theme.txt"
|
cp -a --no-preserve=ownership "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${theme}/theme.txt"
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
||||||
@@ -142,7 +149,7 @@ generate() {
|
|||||||
fi
|
fi
|
||||||
prompt -w "\n Using custom background.jpg as grub background image..."
|
prompt -w "\n Using custom background.jpg as grub background image..."
|
||||||
cp -a --no-preserve=ownership "${REO_DIR}/background.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
cp -a --no-preserve=ownership "${REO_DIR}/background.jpg" "${THEME_DIR}/${theme}/background.jpg"
|
||||||
magick "${THEME_DIR}/${theme}/background.jpg" -auto-orient "${THEME_DIR}/${theme}/background.jpg"
|
"${_MAGICK}" "${THEME_DIR}/${theme}/background.jpg" -auto-orient "${THEME_DIR}/${theme}/background.jpg"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Determine which assets to use based on custom resolution or screen
|
# Determine which assets to use based on custom resolution or screen
|
||||||
|
|||||||
Reference in New Issue
Block a user