Kaydet (Commit) 23c0e00b authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Add some quoting to shell scripts.

I'd be surprised if the places given want globs and word
splitting...

Change-Id: I0eb9f2d39ac43479ee06a2477ba309a8e1944d20
üst d425cc7c
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# #
# use POSIX locale for well-defined tool output # use POSIX locale for well-defined tool output
LO_SAVE_LC_ALL=$LC_ALL LO_SAVE_LC_ALL="$LC_ALL"
LC_ALL=C LC_ALL=C
export LC_ALL export LC_ALL
...@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING ...@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
# resolve installation directory # resolve installation directory
sd_cwd=`pwd` sd_cwd=`pwd`
sd_res=$0 sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_basename=`basename "$sd_res"` sd_basename=`basename "$sd_res"`
...@@ -56,8 +56,8 @@ sd_prog=`pwd` ...@@ -56,8 +56,8 @@ sd_prog=`pwd`
cd "$sd_cwd" cd "$sd_cwd"
# linked build needs additional settings # linked build needs additional settings
if [ -e $sd_prog/ooenv ] ; then if [ -e "${sd_prog}/ooenv" ] ; then
. $sd_prog/ooenv . "${sd_prog}/ooenv}"
fi fi
# try to get some debug output? # try to get some debug output?
...@@ -107,7 +107,7 @@ for arg in $@ $VALGRINDOPT ; do ...@@ -107,7 +107,7 @@ for arg in $@ $VALGRINDOPT ; do
VALGRINDCHECK="valgrind --tool=$VALGRIND --trace-children=yes $valgrind_skip --num-callers=50 --error-limit=no" VALGRINDCHECK="valgrind --tool=$VALGRIND --trace-children=yes $valgrind_skip --num-callers=50 --error-limit=no"
echo "use kill -SIGUSR2 pid to dump traces of active allocations" echo "use kill -SIGUSR2 pid to dump traces of active allocations"
checks="c$checks" checks="c$checks"
case $VALGRIND in case "$VALGRIND" in
helgrind|memcheck) helgrind|memcheck)
export G_SLICE=always-malloc export G_SLICE=always-malloc
export GLIBCXX_FORCE_NEW=1 export GLIBCXX_FORCE_NEW=1
...@@ -130,7 +130,7 @@ fi ...@@ -130,7 +130,7 @@ fi
case "`uname -s`" in case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly) NetBSD|OpenBSD|FreeBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths # this is a temporary hack until we can live with the default search paths
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) JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
if [ -n "${JAVA_HOME}" ]; then if [ -n "${JAVA_HOME}" ]; then
...@@ -138,7 +138,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) ...@@ -138,7 +138,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi fi
;; ;;
AIX) AIX)
LIBPATH=$sd_prog${LIBPATH:+:$LIBPATH} LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}"
export LIBPATH export LIBPATH
;; ;;
esac esac
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
set -e set -e
# resolve installation directory # resolve installation directory
sd_res=$0 sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_basename=`basename "$sd_res"` sd_basename=`basename "$sd_res"`
...@@ -29,7 +29,7 @@ done ...@@ -29,7 +29,7 @@ done
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_prog=`pwd` sd_prog=`pwd`
case $1 in case "$1" in
c++) c++)
printf '%s' "$sd_prog/../Frameworks" printf '%s' "$sd_prog/../Frameworks"
;; ;;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
set -e set -e
# resolve installation directory # resolve installation directory
sd_res=$0 sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_basename=`basename "$sd_res"` sd_basename=`basename "$sd_res"`
...@@ -29,7 +29,7 @@ done ...@@ -29,7 +29,7 @@ done
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_prog=`pwd` sd_prog=`pwd`
case $1 in case "$1" in
c++) c++)
printf '%s' "$sd_prog" printf '%s' "$sd_prog"
;; ;;
......
...@@ -23,7 +23,7 @@ export SAL_ENABLE_FILE_LOCKING ...@@ -23,7 +23,7 @@ export SAL_ENABLE_FILE_LOCKING
# resolve installation directory # resolve installation directory
sd_cwd=`pwd` sd_cwd=`pwd`
sd_res=$0 sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
cd "`dirname "$sd_res"`" cd "`dirname "$sd_res"`"
sd_basename=`basename "$sd_res"` sd_basename=`basename "$sd_res"`
...@@ -36,7 +36,7 @@ cd "$sd_cwd" ...@@ -36,7 +36,7 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths # this is a temporary hack until we can live with the default search paths
case "`uname -s`" in case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly) 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) JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
if [ -n "${JAVA_HOME}" ]; then if [ -n "${JAVA_HOME}" ]; then
...@@ -44,7 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) ...@@ -44,7 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi fi
;; ;;
AIX) AIX)
LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}} LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}"
export LIBPATH export LIBPATH
;; ;;
esac esac
...@@ -61,18 +61,18 @@ do ...@@ -61,18 +61,18 @@ do
done done
# extend the ld_library_path for java: javaldx checks the sofficerc for us # extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/javaldx" ] ; then if [ -x "${sd_prog}/javaldx" ] ; then
my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ my_path=`"${sd_prog}/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then if [ -n "$my_path" ] ; then
sd_platform=`uname -s` sd_platform=`uname -s`
case $sd_platform in case "$sd_platform" in
AIX) AIX)
LIBPATH=$my_path${LIBPATH:+:$LIBPATH} LIBPATH="$my_path${LIBPATH:+:$LIBPATH}"
export 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 export LD_LIBRARY_PATH
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment