bin/run | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit 874fb3729453d5fd67e18203a7dfa6af7932235c Author: Tor Lillqvist <[email protected]> Date: Mon Jan 19 16:20:12 2015 +0200 Make bin/run work better on OS X The app bundle in instdir is called either LibreOffice.app or LibreOfficeDev.app. Change-Id: I2e21656324cc7c52380fc86023bb95c848bb3962 diff --git a/bin/run b/bin/run index 6013f84..e604edf 100755 --- a/bin/run +++ b/bin/run @@ -35,14 +35,17 @@ elif [ $(uname) = Darwin ]; then dir=$(pwd) -if [ ! -d "${dir}/instdir/LibreOffice.app" ]; then - echo "error: cannot find \"instdir/LibreOffice.app\" dir in \"$(pwd)\"" +# Get PRODUCTNAME from config_host.mk, LibreOffice or LibreOfficeDev +eval `grep 'export PRODUCTNAME=' config_host.mk` + +if [ ! -d "${dir}/instdir/$PRODUCTNAME.app" ]; then + echo "error: cannot find \"instdir/$PRODUCTNAME.app\" dir in \"$(pwd)\"" exit 1 fi exedir="${dir}"/workdir/LinkTarget/Executable -export URE_BOOTSTRAP=file://"${dir}"/instdir/LibreOffice.app/Contents/Resources/fundamentalrc -export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"${dir}"/instdir/LibreOffice.app/Contents/Frameworks +export URE_BOOTSTRAP=file://"${dir}"/instdir/$PRODUCTNAME.app/Contents/Resources/fundamentalrc +export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"${dir}"/instdir/$PRODUCTNAME.app/Contents/Frameworks echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" echo "setting search path to: ${DYLD_LIBRARY_PATH}" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
