Skip to content

C
core
Kaydet (Commit) e3cb10c3 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

bin/run: fix indentation 

Change-Id: I97d58f0e6780986356479279f91eba46951b1be0
Reviewed-on: https://gerrit.libreoffice.org/14783Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 5ea32020
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 44 deletions
bin/run
Dosyayı görüntüle @ e3cb10c3
...@@ -11,68 +11,70 @@ ...@@ -11,68 +11,70 @@
if uname | grep -i CYGWIN >/dev/null; then if uname | grep -i CYGWIN >/dev/null; then
dir=$(realpath "$(pwd)") dir=$(realpath "$(pwd)")
while test ! -d "${dir}/instdir/program" ; do while test ! -d "${dir}/instdir/program" ; do
if test "${dir}" = "/"; then if test "${dir}" = "/"; then
echo "error: cannot find \"program\" dir from \"$(pwd)\"" echo "error: cannot find \"program\" dir from \"$(pwd)\""
exit 1 exit 1
fi fi
dir=$(realpath "${dir}/..") dir=$(realpath "${dir}/..")
done done
exedir="${dir}"/workdir/LinkTarget/Executable exedir="${dir}"/workdir/LinkTarget/Executable
export URE_BOOTSTRAP=file:///$(cygpath -m "${dir}")/instdir/program/fundamental.ini export URE_BOOTSTRAP=file:///$(cygpath -m "${dir}")/instdir/program/fundamental.ini
export PATH=${PATH:+$PATH:}"${dir}"/instdir/program export PATH=${PATH:+$PATH:}"${dir}"/instdir/program
echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
echo "setting search path to: ${PATH}" echo "setting search path to: ${PATH}"
echo "execing: ${exedir}/$1" echo "execing: ${exedir}/$1"
exec ${LO_TRACE} "${exedir}"/$@ exec ${LO_TRACE} "${exedir}"/$@
elif [ $(uname) = Darwin ]; then elif [ $(uname) = Darwin ]; then
dir=$(pwd) dir=$(pwd)
# Get PRODUCTNAME from config_host.mk, LibreOffice or LibreOfficeDev # Get PRODUCTNAME from config_host.mk, LibreOffice or LibreOfficeDev
eval `grep 'export PRODUCTNAME=' config_host.mk` eval `grep 'export PRODUCTNAME=' config_host.mk`
if [ ! -d "${dir}/instdir/$PRODUCTNAME.app" ]; then if [ ! -d "${dir}/instdir/$PRODUCTNAME.app" ]; then
echo "error: cannot find \"instdir/$PRODUCTNAME.app\" dir in \"$(pwd)\"" 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/$PRODUCTNAME.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/$PRODUCTNAME.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}"
echo "execing: ${exedir}/$1" echo "execing: ${exedir}/$1"
exec ${LO_TRACE} "${exedir}"/$@ exec ${LO_TRACE} "${exedir}"/$@
else else
dir=$(readlink -f "$(pwd)") dir=$(readlink -f "$(pwd)")
while test ! -d "${dir}/instdir/program" ; do while test ! -d "${dir}/instdir/program" ; do
if test "${dir}" = "/"; then if test "${dir}" = "/"; then
echo "error: cannot find \"program\" dir from \"$(pwd)\"" echo "error: cannot find \"program\" dir from \"$(pwd)\""
exit 1 exit 1
fi fi
dir=$(readlink -f "${dir}/..") dir=$(readlink -f "${dir}/..")
done done
exedir="${dir}"/workdir/LinkTarget/Executable exedir="${dir}"/workdir/LinkTarget/Executable
export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program
echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
echo "setting search path to: ${LD_LIBRARY_PATH}" echo "setting search path to: ${LD_LIBRARY_PATH}"
echo "execing: ${exedir}/$1" echo "execing: ${exedir}/$1"
exec ${LO_TRACE} "${exedir}"/$@ exec ${LO_TRACE} "${exedir}"/$@
fi fi
# vi:set shiftwidth=4 expandtab:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment