You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by mo...@apache.org on 2004/04/21 15:03:57 UTC

cvs commit: cocoon-2.2 cocoon.sh

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 ----------------------------------------------------------