[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - desktop/scripts

[Caolán McNamara]

 desktop/scripts/soffice.sh |    2 +-
 desktop/scripts/unopkg.sh  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b851a56ff8b7dd121b3ce437a5420a7eabcb916
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Dec 11 03:21:29 2010 +0900

    colon needed for LD_LIBRARY_PATH set but empty
    (cherry picked from commit b3820037d60d8d510708fe2b205711e0d228e351)

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 1f1ad3e..71a5f18 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -67,7 +67,7 @@ case "`uname -s`" in
 OpenBSD)
     sd_prog1="$sd_prog/../basis-link/program"
     sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
     export LD_LIBRARY_PATH
     if [ -n "${JAVA_HOME}" ]; then
commit 467236f4d26859add73c87b02e61354d76b6a12d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 21:43:01 2010 +0000

    colon needed for LD_LIBRARY_PATH set but empty
    (cherry picked from commit 1875423c19bafda991f9b40b42e945b46a00b62b)

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 0713385..2be7493 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -48,7 +48,7 @@ case "`uname -s`" in
 OpenBSD)
     sd_prog1="$sd_prog/../basis-link/program"
     sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
     export LD_LIBRARY_PATH
     if [ -n "${JAVA_HOME}" ]; then