niclas 2004/04/16 22:07:46
Modified: merlin/platform/src/bin internal-cygwin.sh internal-unix.sh
merlin merlin-server.sh merlin.sh merlinx
merlinx.sh
Log:
Need to fix the 'x' flags.
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal-cygwin.sh 16 Apr 2004 13:54:08 -0000 1.5
+++ internal-cygwin.sh 17 Apr 2004 05:07:45 -0000 1.6
@@ -1,6 +1,7 @@
#! /bin/sh
#
+
# For Cygwin, ensure paths are in UNIX format before anything is touched
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal-unix.sh 16 Apr 2004 13:54:08 -0000 1.5
+++ internal-unix.sh 17 Apr 2004 05:07:45 -0000 1.6
@@ -1,4 +1,5 @@
#! /bin/sh
+#
echo "Starting Merlin $MERLIN_VERSION."
echo "===================="
1.8 +1 -0 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin 13 Jan 2004 11:41:28 -0000 1.7
+++ merlin 17 Apr 2004 05:07:45 -0000 1.8
@@ -1,6 +1,7 @@
#!/bin/sh
#
+
export MERLIN_VERSION="@MERLIN_CLI_VERSION@"
# Checking for JAVA_HOME is required on *nix due
1.12 +1 -0 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlin-server.sh 16 Apr 2004 13:54:08 -0000 1.11
+++ merlin-server.sh 17 Apr 2004 05:07:45 -0000 1.12
@@ -19,6 +19,7 @@
#
# -----------------------------------------------------------------------------
+
usage()
{
echo "Usage: $0 {start|stop|run|restart|check}"
1.16 +1 -0 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- merlin.sh 16 Apr 2004 13:54:08 -0000 1.15
+++ merlin.sh 17 Apr 2004 05:07:45 -0000 1.16
@@ -1,4 +1,5 @@
#! /bin/sh
+#
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
1.4 +1 -0 avalon/merlin/platform/src/bin/merlinx
Index: merlinx
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlinx 23 Dec 2003 23:15:27 -0000 1.3
+++ merlinx 17 Apr 2004 05:07:45 -0000 1.4
@@ -6,6 +6,7 @@
# For other deployments, please use "merlin" and specify the system
# and repository locations with the -system and -repository switch
# respectively.
+#
#
# Compute the MERLIN_HOME if not already set.
1.15 +1 -0 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- merlinx.sh 16 Apr 2004 13:54:08 -0000 1.14
+++ merlinx.sh 17 Apr 2004 05:07:45 -0000 1.15
@@ -1,4 +1,5 @@
#! /bin/sh
+#
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
