From 38829ea5174ed3ddbbdd920473aa96a330d90c4d Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sun, 17 May 2020 15:15:59 +0200 Subject: [PATCH] #11742 adapt inkscape start utility to Inkscape 1.0 (cherry picked from commit 4552d1c75ffd47b3a6a1ef39dfd255c07320a1a7) --- development/MacOSX/inkscape | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/development/MacOSX/inkscape b/development/MacOSX/inkscape index ca9ef93b68..ff2f8d1fb5 100755 --- a/development/MacOSX/inkscape +++ b/development/MacOSX/inkscape @@ -20,6 +20,14 @@ startinkscape() { pwd=$(pwd) iparams=( "$@" ) oparams=() + # pre 1.0 application has cmd line utility in resources + # this utility needs the explicit option to suppress gui + # 1.0 don't have it and fails to start with it + case "${inkscape}" in + */Resources/*) + wogui="--without-gui" + ;; + esac for i in ${!iparams[@]}; do # echo $i "=>" "${iparams[$i]}" case "${iparams[$i]}" in @@ -37,19 +45,20 @@ startinkscape() { ;; esac done - exec "${inkscape}" --without-gui "${oparams[@]}" + exec "${inkscape}" ${wogui} "${oparams[@]}" } # try to find the inkscape installation... -# at first try the well known location -RESDIR="/Applications/Inkscape.app/Contents/Resources" -if [ -f "${RESDIR}"/bin/inkscape -a -x "${RESDIR}"/bin/inkscape ]; then - startinkscape "${RESDIR}"/bin/inkscape "$@" +# at first try the well known location for Inkscape 1.0 +RESDIR="/Applications/Inkscape.app/Contents/MacOS" +if [ -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 "${DIRLIST[@]}" ; do +for BINDIR in "/Applications/Inkscape.app/Contents/Resources" "${DIRLIST[@]}" ; do RESDIR=$(dirname "${BINDIR}") if [ -f "${RESDIR}"/bin/inkscape -a -x "${RESDIR}"/bin/inkscape ]; then startinkscape "${RESDIR}"/bin/inkscape "$@" -- 2.39.5