[Libreoffice-commits] .: desktop/scripts

[Caolán McNamara]

 desktop/scripts/soffice.sh |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 78ee02f6ed00ef480aa56a95ff26fc405701de53
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 7 15:32:55 2010 +0000

    we can remove this duplicate switch

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index bb26e4b..7a22607 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -62,9 +62,8 @@ fi
 
 sd_binary=`basename "$0" | sed 's/libreoffice/soffice/g'`.bin
 
-# this is a temporary hack until we can live with the default search paths
 case "`uname -s`" in
-OpenBSD)
+OpenBSD) # this is a temporary hack until we can live with the default search paths
     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}}
@@ -74,19 +73,9 @@ OpenBSD)
         export JAVA_HOME
     fi
     ;;
-esac
-
-# this is a temporary hack until we can live with the default search paths
-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}}
-    JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
-    export LD_LIBRARY_PATH
-    if [ -n "${JAVA_HOME}" ]; then
-        export JAVA_HOME
-    fi
+AIX)
+    LIBPATH=$sd_prog:$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LIBPATH:+:$LIBPATH}
+    export LIBPATH
     ;;
 esac