]> git.lyx.org Git - features.git/commitdiff
#11742 use Inkscape 0.92.x converter from Resources of application bundle if detected
authorStephan Witt <switt@lyx.org>
Tue, 19 May 2020 06:49:20 +0000 (08:49 +0200)
committerStephan Witt <switt@lyx.org>
Tue, 19 May 2020 08:26:19 +0000 (10:26 +0200)
(cherry picked from commit 813cd1765c2f3cdab105ad57b1bf36a6cfd88c18)

development/MacOSX/inkscape

index 692f641428b9d4be43a96c917d526c93944e62b8..b57fda56676a57488bfe72a341ba8e6c6a1b39a2 100755 (executable)
@@ -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