[LyX/master] #11742 use Inkscape 0.92.x converter from Resources of application bundle if detected

Stephan Witt switt at lyx.org
Tue May 19 06:27:18 UTC 2020


commit 813cd1765c2f3cdab105ad57b1bf36a6cfd88c18
Author: Stephan Witt <switt at lyx.org>
Date:   Tue May 19 08:49:20 2020 +0200

    #11742 use Inkscape 0.92.x converter from Resources of application bundle if detected
---
 development/MacOSX/inkscape |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/development/MacOSX/inkscape b/development/MacOSX/inkscape
index 692f641..b57fda5 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


More information about the lyx-cvs mailing list