Index: apisupport/harness/release/build.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- apisupport/harness/release/build.xml	6 Sep 2005 19:50:59 -0000	1.5
+++ apisupport/harness/release/build.xml	23 Sep 2005 19:06:02 -0000
@@ -154,7 +154,7 @@
     
     <target name="reload" depends="netbeans">
         <ant antfile="${harness.dir}/run.xml" target="run">
-            <property name="run.args" value="--reload ${cluster}/${module.jar}"/>
+            <property name="run.args" value='--reload "${cluster}/${module.jar}"'/>
         </ant>
     </target>
     
Index: apisupport/harness/release/jnlp.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/jnlp.xml,v
retrieving revision 1.15.2.1
diff -u -r1.15.2.1 jnlp.xml
--- apisupport/harness/release/jnlp.xml	23 Sep 2005 09:17:17 -0000	1.15.2.1
+++ apisupport/harness/release/jnlp.xml	23 Sep 2005 19:06:02 -0000
@@ -252,7 +252,7 @@
         <property name="run.javaws" value="javaws"/>
         <property name="run.args" value=""/>
         <exec executable="${run.javaws}">
-            <arg path="${build.jnlp.local.dir}/master.jnlp"/>
+            <arg file="${build.jnlp.local.dir}/master.jnlp"/>
             <env key="JAVAWS_VM_ARGS" value="${run.args}"/>
         </exec>
     </target>
Index: apisupport/harness/release/run.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/run.xml,v
retrieving revision 1.6
diff -u -r1.6 run.xml
--- apisupport/harness/release/run.xml	31 Aug 2005 22:48:47 -0000	1.6
+++ apisupport/harness/release/run.xml	23 Sep 2005 19:06:02 -0000
@@ -20,7 +20,7 @@
         </condition>
         <property name="test.user.dir" location="build/testuserdir"/>
         <property name="install" location="${netbeans.dest.dir}"/>
-        <property name="run.args.common" value="--userdir ${test.user.dir} -J-Dnetbeans.logger.console=true -J-ea"/>
+        <property name="run.args.common" value='--userdir "${test.user.dir}" -J-Dnetbeans.logger.console=true -J-ea'/>
         <!-- In case run from a suite module, to get app.name and/or branding.token: -->
         <property file="${suite.dir}/nbproject/private/private.properties"/>
         <property file="${suite.dir}/nbproject/project.properties"/>
@@ -34,7 +34,7 @@
         <property name="run.exe" location="${install}\${run.app.exe}"/>
         <property name="run.sh" location="${install}/${run.app.sh}"/>
         <mkdir dir="${test.user.dir}/etc"/>
-        <echo file="${test.user.dir}/etc/netbeans.conf">netbeans_extraclusters=${cluster}</echo>
+        <echo file="${test.user.dir}/etc/netbeans.conf">netbeans_extraclusters="${cluster}"</echo>
         <property name="run.args.prepared" value=""/>
     </target>
 
@@ -71,7 +71,7 @@
         <property name="run.exe" location="${platform.cluster}\lib\nbexec.exe"/>
         <property name="run.sh" location="${platform.cluster}/lib/nbexec"/>
         <property name="branding.token" value="-"/> <!-- fallback value if not set -->
-        <property name="run.args.prepared" value="--branding ${branding.token} --clusters ${run.platform.clusters}"/>
+        <property name="run.args.prepared" value='--branding ${branding.token} --clusters "${run.platform.clusters}"'/>
     </target>
 
     <target name="run" depends="-prepare-as-app,-prepare-as-platform">
Index: apisupport/harness/release/etc/app.conf
===================================================================
RCS file: /cvs/apisupport/harness/release/etc/app.conf,v
retrieving revision 1.3
diff -u -r1.3 app.conf
--- apisupport/harness/release/etc/app.conf	16 Sep 2005 19:52:13 -0000	1.3
+++ apisupport/harness/release/etc/app.conf	23 Sep 2005 19:06:02 -0000
@@ -1,5 +1,5 @@
 # ${HOME} will be replaced by JVM user.home system property
-default_userdir=${HOME}/.${APPNAME}/dev
+default_userdir="${HOME}/.${APPNAME}/dev"
 default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev"
 
 # options used by the launcher by default, can be overridden by explicit
Index: apisupport/harness/release/launchers/app.sh
===================================================================
RCS file: /cvs/apisupport/harness/release/launchers/app.sh,v
retrieving revision 1.2
diff -u -r1.2 app.sh
--- apisupport/harness/release/launchers/app.sh	16 Sep 2005 19:52:13 -0000	1.2
+++ apisupport/harness/release/launchers/app.sh	23 Sep 2005 19:06:02 -0000
@@ -19,47 +19,47 @@
 progdir=`dirname "$PRG"`
 APPNAME=`basename "$0"`
 
-if [ -f "$progdir"/../etc/"$APPNAME".conf ] ; then
-    . "$progdir"/../etc/"$APPNAME".conf
+if [ -f "$progdir/../etc/$APPNAME".conf ] ; then
+    . "$progdir/../etc/$APPNAME".conf
 fi
 
 args="$@"
 
 case "`uname`" in
     Darwin*)
-        userdir=${default_mac_userdir}
+        userdir="${default_mac_userdir}"
         ;;
     *)
-        userdir=${default_userdir}
+        userdir="${default_userdir}"
         ;;
 esac
 while [ $# -gt 0 ] ; do
     case "$1" in
-        --userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
+        --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
             ;;
     esac
     shift
 done
 
-if [ -f "${userdir}"/etc/"$APPNAME".conf ] ; then
-    . "${userdir}"/etc/"$APPNAME".conf
+if [ -f "${userdir}/etc/$APPNAME".conf ] ; then
+    . "${userdir}/etc/$APPNAME".conf
 fi
 
 readClusters() {
   sep=""
   while read X; do 
     echo -n $sep
-    echo -n $progdir/../$X
+    echo -n "$progdir/../$X"
     sep=":"
   done
 }
-clusters=`cat $progdir/../etc/"$APPNAME".clusters | readClusters`
+clusters=`cat "$progdir/../etc/$APPNAME".clusters | readClusters`
 
 if [ ! -z "$extraclusters" ] ; then
     clusters="$clusters:$extraclusters"
 fi
 
-nbexec="$progdir"/../platform6/lib/nbexec
+nbexec="$progdir/../platform6/lib/nbexec"
 
 case "`uname`" in
     Darwin*)
Index: core/launcher/unix/nbexec
===================================================================
RCS file: /cvs/core/launcher/unix/nbexec,v
retrieving revision 1.24
diff -u -r1.24 nbexec
--- core/launcher/unix/nbexec	12 May 2005 12:49:21 -0000	1.24
+++ core/launcher/unix/nbexec	23 Sep 2005 19:06:03 -0000
@@ -74,7 +74,7 @@
             ;;
         # this has to be here for purposes of updater.jar, but it should be
         # better to handle this argument inside the java launcher part 
-        -userdir|--userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
+        -userdir|--userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
             ;;
         -cp|-cp:a|--cp|--cp:a)
             shift;
Index: ide/launcher/unix/netbeans
===================================================================
RCS file: /cvs/ide/launcher/unix/netbeans,v
retrieving revision 1.24
diff -u -r1.24 netbeans
--- ide/launcher/unix/netbeans	8 Sep 2005 19:46:58 -0000	1.24
+++ ide/launcher/unix/netbeans	23 Sep 2005 19:06:13 -0000
@@ -37,12 +37,14 @@
 #     . /etc/netbeans.conf
 # fi
 
-args="$@"
+args=""
 
-userdir=${netbeans_default_userdir}
+userdir="${netbeans_default_userdir}"
 while [ $# -gt 0 ] ; do
     case "$1" in
-        --userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
+        --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
+            ;;
+        *) args="$args $1"
             ;;
     esac
     shift