Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 86860 invoked from network); 21 Apr 2004 13:04:00 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 21 Apr 2004 13:04:00 -0000 Received: (qmail 47144 invoked by uid 500); 21 Apr 2004 13:03:55 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 47089 invoked by uid 500); 21 Apr 2004 13:03:55 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 47068 invoked by uid 500); 21 Apr 2004 13:03:54 -0000 Delivered-To: apmail-cocoon-2.2-cvs@apache.org Received: (qmail 47065 invoked from network); 21 Apr 2004 13:03:54 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 21 Apr 2004 13:03:54 -0000 Received: (qmail 86809 invoked by uid 1299); 21 Apr 2004 13:03:57 -0000 Date: 21 Apr 2004 13:03:57 -0000 Message-ID: <20040421130357.86808.qmail@minotaur.apache.org> From: morrijr@apache.org To: cocoon-2.2-cvs@apache.org Subject: cvs commit: cocoon-2.2 cocoon.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N morrijr 2004/04/21 06:03:57 Modified: . cocoon.sh Log: fix path seperator Revision Changes Path 1.12 +6 -6 cocoon-2.2/cocoon.sh Index: cocoon.sh =================================================================== RCS file: /home/cvs/cocoon-2.2/cocoon.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cocoon.sh 10 Mar 2004 08:43:23 -0000 1.11 +++ cocoon.sh 21 Apr 2004 13:03:57 -0000 1.12 @@ -84,13 +84,13 @@ fi if [ "$COCOON_WEBAPP_HOME" = "" ] ; then - STANDALONE_WEBAPP=../webapp - if [ -d $STANDALONE_WEBAPP ] ; then + STANDALONE_WEBAPP="../webapp" + if [ -d ${STANDALONE_WEBAPP} ] ; then # for standalone-webapp setup - COCOON_WEBAPP_HOME=$STANDALONE_WEBAPP + COCOON_WEBAPP_HOME=${STANDALONE_WEBAPP} else # when in the build environment - COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp" + COCOON_WEBAPP_HOME="${COCOON_HOME}/build/webapp" fi fi echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory" @@ -143,7 +143,7 @@ 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_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}" # ----- Do the action ----------------------------------------------------------