diff options
| author | Joachim Lingner <jl@openoffice.org> | 2011-01-04 12:01:53 +0100 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2011-01-04 12:01:53 +0100 |
| commit | 7508b11431ad7e08ab49a8a239a79ee9ae80334d (patch) | |
| tree | 661469b3352f6c1f0faa9581eba30b6de5fa49aa /desktop/scripts/unopkg.sh | |
| parent | 2e54587cb31ebf2c747297ffd86cd79e2d54a4a0 (diff) | |
| parent | 794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff) | |
jl160 merge with DEV300m96
Diffstat (limited to 'desktop/scripts/unopkg.sh')
| -rw-r--r-- | desktop/scripts/unopkg.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 0828c7f9dbb1..5020b89194d1 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -31,15 +31,14 @@ SAL_ENABLE_FILE_LOCKING=1 export SAL_ENABLE_FILE_LOCKING # resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi +sd_cwd=`pwd` +sd_res=$0 +while [ -h "$sd_res" ] ; do + cd "`dirname "$sd_res"`" + sd_basename=`basename "$sd_res"` + sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"` +done +cd "`dirname "$sd_res"`" sd_prog=`pwd` cd "$sd_cwd" @@ -68,7 +67,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi |