avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon/merlin/platform/src/bin internal-cygwin.sh internal-unix.sh merlin
Date Mon, 29 Dec 2003 02:24:44 GMT
niclas      2003/12/28 18:24:44

  Modified:    merlin/platform/src/bin internal-cygwin.sh internal-unix.sh
                        merlin
  Log:
  Added that the scripts output the 'uname' platform identifier.
  
  Revision  Changes    Path
  1.4       +1 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- internal-cygwin.sh	23 Dec 2003 23:15:27 -0000	1.3
  +++ internal-cygwin.sh	29 Dec 2003 02:24:44 -0000	1.4
  @@ -17,6 +17,7 @@
   
   echo "Starting Merlin $MERLIN_VERSION."
   echo "===================="
  +echo "             Platform: $PLATFORM"
   echo "            Java Home: $JAVA_HOME"
   echo "          Merlin Home: $MERLIN_HOME"
   echo "      Security policy: $MERLIN_HOME/bin/security.policy"
  
  
  
  1.4       +1 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- internal-unix.sh	29 Dec 2003 02:16:51 -0000	1.3
  +++ internal-unix.sh	29 Dec 2003 02:24:44 -0000	1.4
  @@ -2,6 +2,7 @@
   
   echo "Starting Merlin $MERLIN_VERSION."
   echo "===================="
  +echo "             Platform: $PLATFORM"
   echo "            Java Home: $JAVA_HOME"
   echo "          Merlin Home: $MERLIN_HOME"
   echo "      Security policy: $MERLIN_HOME/bin/security.policy"
  
  
  
  1.4       +1 -2      avalon/merlin/platform/src/bin/merlin
  
  Index: merlin
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- merlin	23 Dec 2003 23:15:27 -0000	1.3
  +++ merlin	29 Dec 2003 02:24:44 -0000	1.4
  @@ -13,7 +13,7 @@
     exit 1
   fi
   
  -PLATFORM=`uname`
  +export PLATFORM=`uname`
   
   #
   # Compute the MERLIN_HOME if not already set.
  @@ -30,7 +30,6 @@
   
   if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
       exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"
  -
   elif [ `echo $PLATFORM | grep "Linux"` ] ; then
       exec "$MERLIN_HOME/bin/internal-unix.sh" "$@"
   else
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message