svn commit: rev 21492 - avalon/trunk/runtime/merlin/cli/etc/bin

Author: akarasulu
Date: Sat Jun 19 22:01:37 2004
New Revision: 21492

Modified:
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin
Log:
Broke on Solaris 10 intel due use of /bin/sh without breaking apart the
exports.  Also this new scheme of looking up the cli version does not seem
to work.  Gotta talk to Steve about what he had in mind here: but for now lets
get it working.


Modified: avalon/trunk/runtime/merlin/cli/etc/bin/merlin
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/bin/merlin	(original)
+++ avalon/trunk/runtime/merlin/cli/etc/bin/merlin	Sat Jun 19 22:01:37 2004
@@ -2,7 +2,8 @@
 #
 
 
-export MERLIN_VERSION="@MERLIN_CLI_VERSION@"
+MERLIN_VERSION="3.3.0"
+export MERLIN_VERSION 
 
 # Checking for JAVA_HOME is required on *nix due
 # to some distributions stupidly including kaffe in /usr/bin
@@ -14,7 +15,8 @@
   exit 1
 fi
 
-export PLATFORM=`uname`
+PLATFORM=`uname`
+export PLATFORM
 
 #
 # Compute the MERLIN_HOME if not already set.
@@ -27,7 +29,9 @@
     cd "$CWD"
     export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
 fi
-export MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/system/merlin/jars/merlin-cli-$MERLIN_VERSION.jar"
+
+MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/system/merlin/jars/merlin-cli-$MERLIN_VERSION.jar"
+export MERLIN_BOOTSTRAP_JAR
 
 if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
     exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"