Amend 2d48072e: Get rid of Qt resources

[lyx.git] / development / MacOSX / inkscape

diff --git a/development/MacOSX/inkscape b/development/MacOSX/inkscape
index ff2f8d1fb50d5857a9e53f97a65bc9c126387ba5..4865fde0914eacabd3f9435cc44d6ae10d08f0bf 100755 (executable)
--- a/development/MacOSX/inkscape
+++ b/development/MacOSX/inkscape
@@ -50,15 +50,16 @@ 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
 # this failed... so try PATH expansion to start the inkscape shell wrapper
 # Now continue the check with pre 1.0 inkscape application and the PATH
 IFS=":" read -ra DIRLIST <<< "${PATH}"
-for BINDIR in "/Applications/Inkscape.app/Contents/Resources" "${DIRLIST[@]}" ; do
+for BINDIR in "/Applications/Inkscape.app/Contents/Resources/bin" "${DIRLIST[@]}" ; do
        RESDIR=$(dirname "${BINDIR}")
        if [ -f "${RESDIR}"/bin/inkscape -a -x "${RESDIR}"/bin/inkscape ]; then
                startinkscape "${RESDIR}"/bin/inkscape "$@"