Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 51374 invoked by uid 500); 13 Apr 2003 16:26:56 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 51363 invoked by uid 500); 13 Apr 2003 16:26:56 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 51360 invoked from network); 13 Apr 2003 16:26:56 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 13 Apr 2003 16:26:56 -0000 Received: (qmail 45990 invoked by uid 1299); 13 Apr 2003 16:26:55 -0000 Date: 13 Apr 2003 16:26:55 -0000 Message-ID: <20030413162655.45988.qmail@icarus.apache.org> From: morrijr@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1 cocoon.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N morrijr 2003/04/13 09:26:54 Modified: . cocoon.sh Log: Correctly quote arguments Revision Changes Path 1.6 +16 -16 cocoon-2.1/cocoon.sh Index: cocoon.sh =================================================================== RCS file: /home/cvs/cocoon-2.1/cocoon.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cocoon.sh 13 Apr 2003 13:41:26 -0000 1.5 +++ cocoon.sh 13 Apr 2003 16:26:54 -0000 1.6 @@ -70,11 +70,11 @@ fi if [ "$COCOON_WEBAPP_HOME" = "" ] ; then - COCOON_WEBAPP_HOME=$COCOON_HOME/build/webapp + COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp" fi if [ "$COCOON_LIB" = "" ] ; then - COCOON_LIB=$COCOON_WEBAPP_HOME/WEB-INF/lib + COCOON_LIB="$COCOON_WEBAPP_HOME/WEB-INF/lib" fi if [ "$JETTY_PORT" = "" ] ; then @@ -95,25 +95,25 @@ # ----- Set Local Variables ( used to minimize cut/paste) --------------------- -JAVA=$JAVA_HOME/bin/java -ENDORSED_LIBS=$COCOON_HOME/lib/endorsed -ENDORSED=-Djava.endorsed.dirs=$ENDORSED_LIBS +JAVA="$JAVA_HOME/bin/java" +ENDORSED_LIBS="$COCOON_HOME/lib/endorsed" +ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS" PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser LOADER=Loader -LOADER_LIB=$COCOON_HOME/tools/loader +LOADER_LIB="$COCOON_HOME/tools/loader" CLI=-Dloader.main.class=org.apache.cocoon.Main -CLI_LIBRARIES=-Dloader.jar.repositories=$COCOON_LIB +CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB" JETTY=-Dloader.main.class=org.mortbay.jetty.Server -JETTY_CONF=$COCOON_HOME/tools/jetty/conf -JETTY_MAIN=$JETTY_CONF/main.xml -JETTY_ADMIN=$JETTY_CONF/admin.xml -JETTY_WEBAPP=-Dwebapp=$COCOON_WEBAPP_HOME -JETTY_HOME=-Dhome=$COCOON_HOME -JETTY_PORT_ARGS=-Djetty.port=$JETTY_PORT -JETTY_ADMIN_ARGS=-Djetty.admin.port=$JETTY_ADMIN_PORT -JETTY_LIBRARIES=-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib,$ENDORSED_LIBS +JETTY_CONF="$COCOON_HOME/tools/jetty/conf" +JETTY_MAIN="$JETTY_CONF/main.xml" +JETTY_ADMIN="$JETTY_CONF/admin.xml" +JETTY_WEBAPP="-Dwebapp=$COCOON_WEBAPP_HOME" +JETTY_HOME="-Dhome=$COCOON_HOME" +JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT" +JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT" +JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib,$ENDORSED_LIBS" # ----- Do the action ----------------------------------------------------------