summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-07-16 19:30:18 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-07-16 19:30:18 +0000
commitdc498fd6550ca7c7accb0c2a3888fa1a212d43cd (patch)
treee25f1614068db1f4b8db73df54fb8ae54f536b4b
parent8bbfb90b495e8756a3f81483b827b83602a29184 (diff)
downloadscala-dc498fd6550ca7c7accb0c2a3888fa1a212d43cd.tar.gz
scala-dc498fd6550ca7c7accb0c2a3888fa1a212d43cd.tar.bz2
scala-dc498fd6550ca7c7accb0c2a3888fa1a212d43cd.zip
Scalac was failing if the path to the distribution
contained whitespaces. This simple change fixes that.
-rw-r--r--src/compiler/scala/tools/ant/templates/tool-unix.tmpl2
-rwxr-xr-xsrc/mono/bin/scalac-net2
-rwxr-xr-xtest/partest2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 2a7c650b9a..2d7f49001c 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -41,7 +41,7 @@ fi
# Constructing the extension classpath
TOOL_CLASSPATH="@classpath@"
if [ -z "$TOOL_CLASSPATH" ] ; then
- for ext in `ls -d "$SCALA_HOME"/lib/*` ; do
+ for ext in "$SCALA_HOME"/lib/* ; do
if [ -z "$TOOL_CLASSPATH" ] ; then
TOOL_CLASSPATH="$ext"
else
diff --git a/src/mono/bin/scalac-net b/src/mono/bin/scalac-net
index f1ed94a417..5b77cf7533 100755
--- a/src/mono/bin/scalac-net
+++ b/src/mono/bin/scalac-net
@@ -44,7 +44,7 @@ fi
# Constructing the extension classpath
EXTENSION_CLASSPATH=""
if [ -z "$EXTENSION_CLASSPATH" ] ; then
- for ext in `ls -d "$SCALA_HOME"/lib/*` ; do
+ for ext in "$SCALA_HOME"/lib/* ; do
if [ -z "$EXTENSION_CLASSPATH" ] ; then
EXTENSION_CLASSPATH="$ext"
else
diff --git a/test/partest b/test/partest
index c6eb434d75..f4217d60c1 100755
--- a/test/partest
+++ b/test/partest
@@ -45,7 +45,7 @@ fi
EXT_CLASSPATH=""
if [ -z "$EXT_CLASSPATH" ] ; then
if [ -f "$SCALA_HOME/lib/scala-partest.jar" ] ; then
- for ext in `ls -d "$SCALA_HOME"/lib/*` ; do
+ for ext in "$SCALA_HOME"/lib/* ; do
if [ -z "$EXT_CLASSPATH" ] ; then
EXT_CLASSPATH="$ext"
else