liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Inkscape detection under MSYS2, #4469

Browse Source
This commit is contained in:
Morgan Hardwood
2018-07-21 22:10:48 +02:00
parent 807c1da120
commit 5968c1915d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/generatePngIcons
View File

@@ -20,9 +20,16 @@ mkdir "$tmpDir" || exit 1
outDir="$tmpDir" outDir="$tmpDir"
# Abort if Inkscape is not installed: # Abort if Inkscape is not installed:
if ! command -v inkscape >/dev/null; then if [[ ${OSTYPE^^} = "MSYS" ]]; then
printf '%s\n' "Inkscape does not appear to be installed. Aborting." if ! command -v "/c/Program Files/Inkscape/inkscape.exe" >/dev/null; then
exit 1 printf '%s\n' "Inkscape does not appear to be installed. Aborting."
exit 1
fi
else
if ! command -v inkscape >/dev/null; then
printf '%s\n' "Inkscape does not appear to be installed. Aborting."
exit 1
fi
fi fi
# Command-line arguments: # Command-line arguments:
@@ -112,7 +119,7 @@ convertSvg() {
--skip-if-larger \ --skip-if-larger \
"$1" "$1"
sizeAfter=$(wc -c < "$1") sizeAfter=$(wc -c < "$1")
printf 'Filesize fefore: %s After: %s Difference: %s\n' "$sizeBefore" "$sizeAfter" "$((sizeBefore - sizeAfter))" printf 'Filesize before: %s After: %s Difference: %s\n' "$sizeBefore" "$sizeAfter" "$((sizeBefore - sizeAfter))"
fi fi
} }