2
2
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-12-22 10:08:55 +00:00

Fix icon conversion scripts broken on recent macOS (fix #1277)

This commit is contained in:
Ronan Jouchet 2021-11-22 16:18:02 -05:00
parent 702ff1e4b6
commit 4405b5d28b
2 changed files with 2 additions and 2 deletions

View File

@ -38,7 +38,7 @@ if [ -z "${DEST}" ]; then
exit 1 exit 1
fi fi
TEMP_DIR="$(mktemp -d -t nativefier_icons)" TEMP_DIR="$(mktemp -d -t nativefier-icns-XXXXXX)"
ICONSET="${TEMP_DIR}/converted.iconset" ICONSET="${TEMP_DIR}/converted.iconset"
function cleanUp() { function cleanUp() {

View File

@ -58,7 +58,7 @@ type convert &>/dev/null && HAVE_IMAGEMAGICK=true && CONVERT="convert"
type sips &>/dev/null && HAVE_SIPS=true type sips &>/dev/null && HAVE_SIPS=true
if [[ -n "$HAVE_IMAGEMAGICK" || -n "$HAVE_GRAPHICSMAGICK" ]]; then if [[ -n "$HAVE_IMAGEMAGICK" || -n "$HAVE_GRAPHICSMAGICK" ]]; then
PNG_PATH="$(mktemp -d)/icon.png" PNG_PATH="$(mktemp -d -t nativefier-iconset-XXXXXX)/icon.png"
"${BASH_SOURCE%/*}/convertToPng" "${SOURCE}" "${PNG_PATH}" "${BASH_SOURCE%/*}/convertToPng" "${SOURCE}" "${PNG_PATH}"
make_iconset_imagemagick "${PNG_PATH}" "${DEST}" make_iconset_imagemagick "${PNG_PATH}" "${DEST}"
elif [[ -n "$HAVE_SIPS" ]]; then elif [[ -n "$HAVE_SIPS" ]]; then