summaryrefslogtreecommitdiff
path: root/desktop/scripts
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-03-07 12:14:15 +0000
committerOliver Bolte <obo@openoffice.org>2007-03-07 12:14:15 +0000
commitca26e7fcb85434e3e825fd113ddf87c311a2a39d (patch)
treed400c395e9dcc15f6b6a345497b3a5ec77760eaa /desktop/scripts
parentc236d0a270501e15e700c25dc61595a00c98e665 (diff)
INTEGRATION: CWS pj73 (1.25.164); FILE MERGED
2007/02/14 20:51:01 pjanik 1.25.164.1: #i72685#: quote the path to libraries, because it can contain space.
Diffstat (limited to 'desktop/scripts')
-rw-r--r--desktop/scripts/soffice.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index d4ba64d43e..c7719b243b 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -5,9 +5,9 @@
#
# $RCSfile: soffice.sh,v $
#
-# $Revision: 1.25 $
+# $Revision: 1.26 $
#
-# last change: $Author: kz $ $Date: 2006-07-05 22:33:58 $
+# last change: $Author: obo $ $Date: 2007-03-07 13:14:15 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -43,9 +43,9 @@
SAL_ENABLE_FILE_LOCKING=1
export SAL_ENABLE_FILE_LOCKING
-# Uncomment the below line if you suspect that OpenGL is not
+# Uncomment the line below if you suspect that OpenGL is not
# working on your system.
-# export SAL_NOOPENGL=true;
+# SAL_NOOPENGL=true; export SAL_NOOPENGL
sd_platform=`uname -s`
@@ -61,7 +61,7 @@ fi
sd_cwd="`pwd`"
if [ -h "$0" ] ; then
sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
cd "`dirname "$0"`"
cd "`dirname "$sd_script"`"
else
@@ -105,7 +105,7 @@ case $sd_platform in
Darwin)
# this is a temporary hack until we can live with the default search paths
- if [ $DYLD_LIBRARY_PATH ]; then
+ if [ "$DYLD_LIBRARY_PATH" ]; then
SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
export SYSTEM_DYLD_LIBRARY_PATH
DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH