Make bin/run work better on OS X
The app bundle in instdir is called either LibreOffice.app or LibreOfficeDev.app. Change-Id: I2e21656324cc7c52380fc86023bb95c848bb3962
This commit is contained in:
11
bin/run
11
bin/run
@@ -35,14 +35,17 @@ elif [ $(uname) = Darwin ]; then
|
|||||||
|
|
||||||
dir=$(pwd)
|
dir=$(pwd)
|
||||||
|
|
||||||
if [ ! -d "${dir}/instdir/LibreOffice.app" ]; then
|
# Get PRODUCTNAME from config_host.mk, LibreOffice or LibreOfficeDev
|
||||||
echo "error: cannot find \"instdir/LibreOffice.app\" dir in \"$(pwd)\""
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exedir="${dir}"/workdir/LinkTarget/Executable
|
exedir="${dir}"/workdir/LinkTarget/Executable
|
||||||
export URE_BOOTSTRAP=file://"${dir}"/instdir/LibreOffice.app/Contents/Resources/fundamentalrc
|
export URE_BOOTSTRAP=file://"${dir}"/instdir/$PRODUCTNAME.app/Contents/Resources/fundamentalrc
|
||||||
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"${dir}"/instdir/LibreOffice.app/Contents/Frameworks
|
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 URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
|
||||||
echo "setting search path to: ${DYLD_LIBRARY_PATH}"
|
echo "setting search path to: ${DYLD_LIBRARY_PATH}"
|
||||||
|
Reference in New Issue
Block a user