From: Stephan Witt <switt@lyx.org>
Date: Tue, 19 May 2020 06:49:20 +0000 (+0200)
Subject: #11742 use Inkscape 0.92.x converter from Resources of application bundle if detected
X-Git-Tag: 2.3.5~23
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=95f18d1c04daf65f4d9d695fe6177603015e9ce2;p=features.git

#11742 use Inkscape 0.92.x converter from Resources of application bundle if detected

(cherry picked from commit 813cd1765c2f3cdab105ad57b1bf36a6cfd88c18)
---

diff --git a/development/MacOSX/inkscape b/development/MacOSX/inkscape
index 692f641428..b57fda5667 100755
--- a/development/MacOSX/inkscape
+++ b/development/MacOSX/inkscape
@@ -50,8 +50,9 @@ startinkscape() {
 
 # try to find the inkscape installation...
 # at first try the well known location for Inkscape 1.0
+# but check for Inkscape 0.92.x too and skip this if it's in Resources
 RESDIR="/Applications/Inkscape.app/Contents/MacOS"
-if [ -f "${RESDIR}"/inkscape -a -x "${RESDIR}"/inkscape ]; then
+if [ !f "/Applications/Inkscape.app/Contents/Resources/bin/inkscape" -a -f "${RESDIR}"/inkscape -a -x "${RESDIR}"/inkscape ]; then
 	startinkscape "${RESDIR}"/inkscape "$@"
 	exit 0
 fi