diff options
Diffstat (limited to 'desktop/scripts/unopkg.sh')
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index f21e4d1193b7..a9d43bf90220 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -23,7 +23,7 @@ export SAL_ENABLE_FILE_LOCKING # resolve installation directory sd_cwd=`pwd` -sd_res=$0 +sd_res="$0" while [ -h "$sd_res" ] ; do cd "`dirname "$sd_res"`" sd_basename=`basename "$sd_res"` @@ -36,7 +36,7 @@ cd "$sd_cwd" # this is a temporary hack until we can live with the default search paths case "`uname -s`" in NetBSD|OpenBSD|FreeBSD|DragonFly) - LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH if [ -n "${JAVA_HOME}" ]; then @@ -44,7 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) fi ;; AIX) - LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}} + LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}" export LIBPATH ;; esac @@ -61,18 +61,18 @@ do done # extend the ld_library_path for java: javaldx checks the sofficerc for us -if [ -x "$sd_prog/javaldx" ] ; then - my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ +if [ -x "${sd_prog}/javaldx" ] ; then + my_path=`"${sd_prog}/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then sd_platform=`uname -s` - case $sd_platform in + case "$sd_platform" in AIX) - LIBPATH=$my_path${LIBPATH:+:$LIBPATH} + LIBPATH="$my_path${LIBPATH:+:$LIBPATH}" export LIBPATH ;; *) - 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 ;; esac |