Index: core/release/bin/runide.sh =================================================================== RCS file: /cvs/core/release/bin/runide.sh,v retrieving revision 1.26 diff -u -r1.26 runide.sh --- core/release/bin/runide.sh 20 Jan 2002 15:53:06 -0000 1.26 +++ core/release/bin/runide.sh 29 Jan 2002 16:44:33 -0000 @@ -7,7 +7,7 @@ # http://www.sun.com/ # # The Original Code is NetBeans. The Initial Developer of the Original -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun +# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun # Microsystems, Inc. All Rights Reserved. # ----------------------------------------------------- @@ -44,7 +44,7 @@ # absolutize idehome -oldpwd=`pwd` ; cd ${idehome}; idehome=`pwd`; cd $oldpwd; unset oldpwd +oldpwd=`pwd` ; cd "${idehome}"; idehome=`pwd`; cd "$oldpwd"; unset oldpwd # calculate branding to brand userdir with defaults="$idehome/bin/.runide_defaults.sh" @@ -61,8 +61,8 @@ thread_flag="" jargs=${jreflags} -jargs="$jargs -Dnetbeans.home=$idehome" -jargs="$jargs -Djava.security.policy=$idehome/bin/ide.policy" +jargs="$jargs -Dnetbeans.home=\"$idehome\"" +jargs="$jargs -Djava.security.policy=\"$idehome/bin/ide.policy\"" args="" @@ -198,7 +198,7 @@ # if [ ! -z "$userdir" ] ; then - jargs="-Dnetbeans.user=$userdir $jargs" + jargs="-Dnetbeans.user=\"$userdir\" $jargs" fi # @@ -211,8 +211,8 @@ append_jars_to_cp() { dir="$1" for ex in jar zip ; do - if [ "`echo ${dir}/*.$ex`" != "${dir}/*.$ex" ] ; then - for x in ${dir}/*.$ex ; do + if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then + for x in "${dir}"/*.$ex ; do # XXX also filter out lib/locale/updater*.jar to make Japanese startup faster # (and put it back in below when building ${updatercp} if [ "$x" != "$idehome/lib/updater.jar" -a "$x" != "$userdir/lib/updater.jar" ] ; then @@ -238,13 +238,13 @@ } do_run_updater() { - eval $jdkhome/bin/java $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class + eval "\"$jdkhome\"/bin/java" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class } look_for_pre_runs() { base="$1" dir="${base}/update/download" - if [ -f "${dir}/install_later.xml" -a "`echo ${dir}/*.nbm`" != "${dir}/*.nbm" ] ; then + if [ -f "${dir}/install_later.xml" -a "`echo "${dir}"/*.nbm`" != "${dir}/*.nbm" ] ; then run_updater=yes fi } @@ -252,7 +252,7 @@ look_for_post_runs() { base="$1" dir="${base}/update/download" - if [ \! -f "${dir}/install_later.xml" -a "`echo ${dir}/*.nbm`" != "${dir}/*.nbm" ] ; then + if [ \! -f "${dir}/install_later.xml" -a "`echo "${dir}"/*.nbm`" != "${dir}/*.nbm" ] ; then run_updater=yes fi } @@ -318,7 +318,7 @@ # idehome comes second - build_cp ${idehome} + build_cp "${idehome}" if [ -f "${idehome}/lib/updater.jar" ] ; then if [ ! -z "$updatercp" ] ; then updatercp="${updatercp}:" ; fi @@ -329,8 +329,8 @@ for ex in jar zip ; do # XXX does this still work if ${jdkhome} contains spaces? - if [ "`echo ${jdkhome}/lib/*.$ex`" != "${jdkhome}/lib/*.$ex" ] ;then - for x in ${jdkhome}/lib/*.$ex ; do + if [ "`echo "${jdkhome}"/lib/*.$ex`" != "${jdkhome}/lib/*.$ex" ] ;then + for x in "${jdkhome}"/lib/*.$ex ; do if [ ! -z "$cp" ] ; then cp="$cp:" ; fi cp="${cp}$x" done @@ -371,8 +371,7 @@ # # let's go # - - eval $jdkhome/bin/java $thread_flag -classpath "\"$cp\"" \ + eval "\"$jdkhome\"/bin/java" $thread_flag -classpath "\"$cp\"" \ -Dnetbeans.osenv="${nbenvfile}" \ $jargs $ide_class $args