summaryrefslogtreecommitdiff
path: root/bin/run
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-01-19 16:20:12 +0200
committerTor Lillqvist <tml@collabora.com>2015-01-19 16:22:37 +0200
commit874fb3729453d5fd67e18203a7dfa6af7932235c (patch)
treea7cc027079a974c75d413898695f5ee6913028f7 /bin/run
parent905bab9e46f9a15d4402954b70913d66fc6d3cd5 (diff)
Make bin/run work better on OS X
The app bundle in instdir is called either LibreOffice.app or LibreOfficeDev.app. Change-Id: I2e21656324cc7c52380fc86023bb95c848bb3962
Diffstat (limited to 'bin/run')
-rwxr-xr-xbin/run11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/run b/bin/run
index 6013f8452be9..e604edfb8bef 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}"