aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorArmin Weatherwax2010-08-25 16:32:09 +0200
committerMcCabe Maxsted2010-08-26 11:27:57 -0700
commit714b364590302109e58b0dabb497b4141e6dc534 (patch)
treedddb4d727c1a2104d9f3650213e255c127db94fb
parentReapply 575931: Disable avatar appearance facelight when local lighting turne... (diff)
downloadmeta-impy-714b364590302109e58b0dabb497b4141e6dc534.zip
meta-impy-714b364590302109e58b0dabb497b4141e6dc534.tar.gz
meta-impy-714b364590302109e58b0dabb497b4141e6dc534.tar.bz2
meta-impy-714b364590302109e58b0dabb497b4141e6dc534.tar.xz
fix missing quotes in linux scripts
-rwxr-xr-xlinden/indra/newview/linux_tools/getvoice.sh2
-rwxr-xr-xlinden/indra/newview/linux_tools/wrapper.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/linux_tools/getvoice.sh b/linden/indra/newview/linux_tools/getvoice.sh
index f119e82..13b632f 100755
--- a/linden/indra/newview/linux_tools/getvoice.sh
+++ b/linden/indra/newview/linux_tools/getvoice.sh
@@ -4,7 +4,7 @@ SCRIPTSRC=`readlink -f "$0" || echo "$0"`
4RUN_PATH=`dirname "${SCRIPTSRC}" || echo .` 4RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`
5 5
6#if mozilla-runtime-linux-x86_64 is present we are using 64bit Imprudence on 64bit Linux 6#if mozilla-runtime-linux-x86_64 is present we are using 64bit Imprudence on 64bit Linux
7if [ -d ${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/ ]; then 7if [ -d "${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/" ]; then
8 LIB_INSTALLDIR="lib32/" # It's 32bit voice on 64bit Linux and 64bit viewer. Not using lib/ for avoiding ambiguity. 8 LIB_INSTALLDIR="lib32/" # It's 32bit voice on 64bit Linux and 64bit viewer. Not using lib/ for avoiding ambiguity.
9else 9else
10 LIB_INSTALLDIR="lib/" # It's 32bit voice on 32 or 64bit Linux and 32bit viewer. 10 LIB_INSTALLDIR="lib/" # It's 32bit voice on 32 or 64bit Linux and 32bit viewer.
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 8a81843..bc2c127 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -107,7 +107,7 @@ if [ -n "$LL_TCMALLOC" ]; then
107 fi 107 fi
108fi 108fi
109 109
110if ([ "`uname -m`" = "x86_64" ] && [ -d ${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/ ]); then 110if([ "`uname -m`" = "x86_64" ] && [ -d "${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/" ]); then
111 export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/" 111 export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/"
112 112
113 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"' 113 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'