You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ra...@apache.org on 2011/01/10 19:37:10 UTC

svn commit: r1057307 - in /lenya/branches/BRANCH_2_1_X: configure.bat configure.sh

Author: rainer
Date: Mon Jan 10 18:37:10 2011
New Revision: 1057307

URL: http://svn.apache.org/viewvc?rev=1057307&view=rev
Log:
configure.{bat,sh}: add double quotes around command line arguments that
                    may contain path names with whitespace characters.


Modified:
    lenya/branches/BRANCH_2_1_X/configure.bat
    lenya/branches/BRANCH_2_1_X/configure.sh

Modified: lenya/branches/BRANCH_2_1_X/configure.bat
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/configure.bat?rev=1057307&r1=1057306&r2=1057307&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/configure.bat (original)
+++ lenya/branches/BRANCH_2_1_X/configure.bat Mon Jan 10 18:37:10 2011
@@ -33,11 +33,11 @@ if "%1" == "gui" goto javaGui
 goto javaCmd
 
 :javaGui
-java -classpath %CP% org.apache.lenya.config.impl.ConfigureGUI %LENYA_HOME%
+java -classpath "%CP%" org.apache.lenya.config.impl.ConfigureGUI "%LENYA_HOME%"
 goto end
 
 :javaCmd
-java -classpath %CP% org.apache.lenya.config.impl.ConfigureCommandLine %LENYA_HOME%
+java -classpath "%CP%" org.apache.lenya.config.impl.ConfigureCommandLine "%LENYA_HOME%"
 goto end
 
 :help

Modified: lenya/branches/BRANCH_2_1_X/configure.sh
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/configure.sh?rev=1057307&r1=1057306&r2=1057307&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/configure.sh (original)
+++ lenya/branches/BRANCH_2_1_X/configure.sh Mon Jan 10 18:37:10 2011
@@ -27,8 +27,9 @@ fi
 JAVA_HOME="$JAVA_HOME"
 if [ "$JAVA_HOME" = "" ];then
   echo "ERROR: No JAVA_HOME set yet!"
-  echo "       Have you installed JDK 1.6.0 or higher?"
+  echo "       Have you installed JDK 1.4.2 or higher?"
   echo ""
+  echo "NOTE:  Apache Lenya does not work properly with JDK 1.5!"
   exit 1
 fi
                                                                                                                                                              
@@ -50,9 +51,9 @@ fi
 
 PWD=`pwd`
 if [ "$UI_TYPE" = "cmd" ];then
-  java org.apache.lenya.config.impl.ConfigureCommandLine $PWD
+  java org.apache.lenya.config.impl.ConfigureCommandLine "$PWD"
 elif [ "$UI_TYPE" = "gui" ]; then
-  java org.apache.lenya.config.impl.ConfigureGUI $PWD
+  java org.apache.lenya.config.impl.ConfigureGUI "$PWD"
 else
   echo "ERROR: No such User Interface: $UI_TYPE"
   exit 1



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org