diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:34:20 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:34:20 +0000 |
commit | d4d7d5a90b8aee18a9d1ccd84f998b202f7185a6 (patch) | |
tree | a69bf3337d5d742ef4badcaaf15bf6019d6733b1 /shell/source/unix | |
parent | 226a2259a779ce93ce73089366e77671154f99b2 (diff) |
INTEGRATION: CWS sb83 (1.4.64); FILE MERGED
2008/02/12 12:45:17 sb 1.4.64.1: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
Diffstat (limited to 'shell/source/unix')
-rwxr-xr-x | shell/source/unix/misc/cde-open-url.sh | 49 | ||||
-rw-r--r-- | shell/source/unix/misc/gnome-open-url.sh | 49 | ||||
-rwxr-xr-x | shell/source/unix/misc/open-url.sh | 49 |
3 files changed, 0 insertions, 147 deletions
diff --git a/shell/source/unix/misc/cde-open-url.sh b/shell/source/unix/misc/cde-open-url.sh index e0d3be7a094f..c0c38145d6ee 100755 --- a/shell/source/unix/misc/cde-open-url.sh +++ b/shell/source/unix/misc/cde-open-url.sh @@ -1,54 +1,5 @@ #!/bin/sh -# restore search path for dynamic loader to system defaults to -# avoid version clashes of mozilla libraries shipped with OOo -case `uname -s` in - AIX) - LIBPATH=$SYSTEM_LIBPATH - if [ -z "$LIBPATH" ]; then - unset LIBPATH SYSTEM_LIBPATH - else - export LIBPATH; unset SYSTEM_LIBPATH - fi - ;; - - Darwin) - DYLD_LIBRARY_PATH=$SYSTEM_DYLD_LIBRARY_PATH - if [ -z "$DYLD_LIBRARY_PATH" ]; then - unset DYLD_LIBRARY_PATH SYSTEM_DYLD_LIBRARY_PATH - else - export DYLD_LIBRARY_PATH; unset SYSTEM_DYLD_LIBRARY_PATH - fi - ;; - - HP-UX) - SHLIB_PATH=$SYSTEM_SHLIB_PATH - if [ -z "$SHLIB_PATH" ]; then - unset SHLIB_PATH SYSTEM_SHLIB_PATH - else - export SHLIB_PATH; unset SYSTEM_SHLIB_PATH - fi - ;; - - IRIX*) - LD_LIBRARYN32_PATH=$SYSTEM_LD_LIBRARYN32_PATH - if [ -z "$LD_LIBRARYN32_PATH" ]; then - unset LD_LIBRARYN32_PATH SYSTEM_LD_LIBRARYN32_PATH - else - export LD_LIBRARYN32_PATH; unset $SYSTEM_LD_LIBRARYN32_PATH - fi - ;; - - *) - LD_LIBRARY_PATH=$SYSTEM_LD_LIBRARY_PATH - if [ -z "$LD_LIBRARY_PATH" ]; then - unset LD_LIBRARY_PATH SYSTEM_LD_LIBRARY_PATH - else - export LD_LIBRARY_PATH; unset SYSTEM_LD_LIBRARY_PATH - fi - ;; -esac - if [ -x /usr/bin/mktemp ] then TMPFILE=`mktemp -t open-url.XXXXXX` diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh index 026f68bd22e9..1a52fc763783 100644 --- a/shell/source/unix/misc/gnome-open-url.sh +++ b/shell/source/unix/misc/gnome-open-url.sh @@ -1,54 +1,5 @@ #!/bin/sh -# restore search path for dynamic loader to system defaults to -# avoid version clashes of mozilla libraries shipped with OOo -case `uname -s` in - AIX) - LIBPATH=$SYSTEM_LIBPATH - if [ -z "$LIBPATH" ]; then - unset LIBPATH SYSTEM_LIBPATH - else - export LIBPATH; unset SYSTEM_LIBPATH - fi - ;; - - Darwin) - DYLD_LIBRARY_PATH=$SYSTEM_DYLD_LIBRARY_PATH - if [ -z "$DYLD_LIBRARY_PATH" ]; then - unset DYLD_LIBRARY_PATH SYSTEM_DYLD_LIBRARY_PATH - else - export DYLD_LIBRARY_PATH; unset SYSTEM_DYLD_LIBRARY_PATH - fi - ;; - - HP-UX) - SHLIB_PATH=$SYSTEM_SHLIB_PATH - if [ -z "$SHLIB_PATH" ]; then - unset SHLIB_PATH SYSTEM_SHLIB_PATH - else - export SHLIB_PATH; unset SYSTEM_SHLIB_PATH - fi - ;; - - IRIX*) - LD_LIBRARYN32_PATH=$SYSTEM_LD_LIBRARYN32_PATH - if [ -z "$LD_LIBRARYN32_PATH" ]; then - unset LD_LIBRARYN32_PATH SYSTEM_LD_LIBRARYN32_PATH - else - export LD_LIBRARYN32_PATH; unset $SYSTEM_LD_LIBRARYN32_PATH - fi - ;; - - *) - LD_LIBRARY_PATH=$SYSTEM_LD_LIBRARY_PATH - if [ -z "$LD_LIBRARY_PATH" ]; then - unset LD_LIBRARY_PATH SYSTEM_LD_LIBRARY_PATH - else - export LD_LIBRARY_PATH; unset SYSTEM_LD_LIBRARY_PATH - fi - ;; -esac - # use gnome-open utility coming with libgnome if available gnome-open "$1" 2>/dev/null || "$0.bin" $1 diff --git a/shell/source/unix/misc/open-url.sh b/shell/source/unix/misc/open-url.sh index a59096f12076..5a70785f89d3 100755 --- a/shell/source/unix/misc/open-url.sh +++ b/shell/source/unix/misc/open-url.sh @@ -44,55 +44,6 @@ run_browser() { }' > /dev/null } -# restore search path for dynamic loader to system defaults to -# avoid version clashes of mozilla libraries shipped with OOo -case `uname -s` in - AIX) - LIBPATH=$SYSTEM_LIBPATH - if [ -z "$LIBPATH" ]; then - unset LIBPATH SYSTEM_LIBPATH - else - export LIBPATH; unset SYSTEM_LIBPATH - fi - ;; - - Darwin) - DYLD_LIBRARY_PATH=$SYSTEM_DYLD_LIBRARY_PATH - if [ -z "$DYLD_LIBRARY_PATH" ]; then - unset DYLD_LIBRARY_PATH SYSTEM_DYLD_LIBRARY_PATH - else - export DYLD_LIBRARY_PATH; unset SYSTEM_DYLD_LIBRARY_PATH - fi - ;; - - HP-UX) - SHLIB_PATH=$SYSTEM_SHLIB_PATH - if [ -z "$SHLIB_PATH" ]; then - unset SHLIB_PATH SYSTEM_SHLIB_PATH - else - export SHLIB_PATH; unset SYSTEM_SHLIB_PATH - fi - ;; - - IRIX*) - LD_LIBRARYN32_PATH=$SYSTEM_LD_LIBRARYN32_PATH - if [ -z "$LD_LIBRARYN32_PATH" ]; then - unset LD_LIBRARYN32_PATH SYSTEM_LD_LIBRARYN32_PATH - else - export LD_LIBRARYN32_PATH; unset $SYSTEM_LD_LIBRARYN32_PATH - fi - ;; - - *) - LD_LIBRARY_PATH=$SYSTEM_LD_LIBRARY_PATH - if [ -z "$LD_LIBRARY_PATH" ]; then - unset LD_LIBRARY_PATH SYSTEM_LD_LIBRARY_PATH - else - export LD_LIBRARY_PATH; unset SYSTEM_LD_LIBRARY_PATH - fi - ;; -esac - # special handling for mailto: uris if echo $1 | grep '^mailto:' > /dev/null; then # check $MAILER variable |