niclas      2003/12/23 14:48:59

  Modified:    merlin/platform/src/bin internal-cygwin.sh internal-unix.sh
                        merlin merlinx
  Log:
  I think I have managed to fix the space problem on Linux/Unix system. Need to check 
if it works on CygWin.
  
  Revision  Changes    Path
  1.2       +5 -1      avalon/merlin/platform/src/bin/internal-cygwin.sh
  
  Index: internal-cygwin.sh
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/internal-cygwin.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- internal-cygwin.sh        23 Dec 2003 21:46:33 -0000      1.1
  +++ internal-cygwin.sh        23 Dec 2003 22:48:59 -0000      1.2
  @@ -24,4 +24,8 @@
   echo "     Merlin Arguments: $MERLIN_ARGS $@"
   echo ""
   
  -"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" 
"-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $MERLIN_ARGS "$@"
  +ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" 
\"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS 
\"[EMAIL PROTECTED]""
  +echo -n "$JAVA" >$MERLIN_HOME/command-line.log
  +echo "$ARGS" >>$MERLIN_HOME/command-line.log
  +
  +echo ARGS | xargs "$JAVA"
  
  
  
  1.2       +8 -1      avalon/merlin/platform/src/bin/internal-unix.sh
  
  Index: internal-unix.sh
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/internal-unix.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- internal-unix.sh  23 Dec 2003 21:46:33 -0000      1.1
  +++ internal-unix.sh  23 Dec 2003 22:48:59 -0000      1.2
  @@ -10,5 +10,12 @@
   echo "     Merlin Arguments: $MERLIN_ARGS $@"
   echo ""
   
  -"$JAVA_HOME/bin/java" $MERLIN_JVM_OPTS 
"-Djava.security.policy=$MERLIN_HOME/bin/security.policy" 
"-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $MERLIN_ARGS "$@"
  +JAVA="$JAVA_HOME/bin/java"
  +
  +ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" 
\"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS 
\"[EMAIL PROTECTED]""
  +echo -n "$JAVA" >$MERLIN_HOME/command-line.log
  +echo "$ARGS" >>$MERLIN_HOME/command-line.log
  +
  +echo $ARGS | xargs "$JAVA"
  +
    
  
  
  
  1.2       +12 -7     avalon/merlin/platform/src/bin/merlin
  
  Index: merlin
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlin    23 Dec 2003 21:46:33 -0000      1.1
  +++ merlin    23 Dec 2003 22:48:59 -0000      1.2
  @@ -14,14 +14,19 @@
   fi
   
   PLATFORM=`uname`
  -CWD=`pwd`
  -BIN_DIR=`dirname "$0"`
  -cd "$BIN_DIR"
  -ABSOLUTE_PATH=`pwd`
  -cd "$CWD"
   
  -export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
  -export MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-$MERLIN_VERSION.jar
  +#
  +# Compute the MERLIN_HOME if not already set.
  +#
  +if [ -z "$MERLIN_HOME" ] ; then
  +    CWD=`pwd`
  +    BIN_DIR=`dirname "$0"`
  +    cd "$BIN_DIR"
  +    ABSOLUTE_PATH=`pwd`
  +    cd "$CWD"
  +    export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
  +fi
  +export MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/bin/lib/merlin-cli-$MERLIN_VERSION.jar"
   
   if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
       exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"
  
  
  
  1.2       +16 -4     avalon/merlin/platform/src/bin/merlinx
  
  Index: merlinx
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlinx   23 Dec 2003 21:46:33 -0000      1.1
  +++ merlinx   23 Dec 2003 22:48:59 -0000      1.2
  @@ -1,10 +1,22 @@
   #!/bin/sh
   #
  +# This extended Merlin command-line launch script is intended to be
  +# used during development, when Maven repository are used exclusively.
   #
  +# For other deployments, please use "merlin" and specify the system
  +# and repository locations with the -system and -repository switch
  +# respectively.
   
  -if [ -z $MERLIN_HOME ] ; then
  +#
  +# Compute the MERLIN_HOME if not already set.
  +#
  +if [ -z "$MERLIN_HOME" ] ; then
  +    CWD=`pwd`
       BIN_DIR=`dirname "$0"`
  -    export MERLIN_HOME=`dirname "$BIN_DIR"`
  +    cd "$BIN_DIR"
  +    ABSOLUTE_PATH=`pwd`
  +    cd "$CWD"
  +    export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
   fi
   
   # Checking for REPOSITORY
  @@ -14,6 +26,6 @@
       REPOSITORY="$MAVEN_HOME_LOCAL/repository"
   fi
   
  -export MERLIN_ARGS="$MERLIN_ARGS -system $REPOSITORY -repository $REPOSITORY"
  +export MERLIN_ARGS="$MERLIN_ARGS -system \"$REPOSITORY\" -repository 
\"$REPOSITORY\""
   
  -exec "$MERLIN_HOME/bin/merlin" "$@"
  +"$MERLIN_HOME/bin/merlin"  "$@"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to