From dc498fd6550ca7c7accb0c2a3888fa1a212d43cd Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Thu, 16 Jul 2009 19:30:18 +0000 Subject: Scalac was failing if the path to the distribution contained whitespaces. This simple change fixes that. --- src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 2 +- src/mono/bin/scalac-net | 2 +- test/partest | 2 +- 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 -- cgit v1.2.3