svn commit: r1582344 - /tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh

[tv...@apache.org]

Author: tveronezi
Date: Thu Mar 27 15:14:58 2014
New Revision: 1582344

URL: http://svn.apache.org/r1582344
Log:
Fixing typo and adding check for system-wide instances.

Modified:
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh?rev=1582344&r1=1582343&r2=1582344&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee-instance.sh Thu Mar 27 15:14:58 2014
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 export CATALINA_HOME=/usr/share/tomee/$classifier/$tomeeVersion
 export CATALINA_BASE=\$(cd \$(dirname \$0) && cd .. && pwd)
 
@@ -9,7 +9,7 @@ buildIt() {
         exit 1
     fi
     if [ -d "\$1" ]; then
-        echo "'\$1' already exists. Please chose another path."
+        echo "'\$1' already exists. Please choose another path."
         exit 1
     fi
     home=\$1
@@ -29,16 +29,27 @@ buildIt() {
     return 0
 }
 
+checkInstance(){
+    if [ \$CATALINA_HOME == "\$CATALINA_BASE" ]; then
+        echo "Please use 'service tomee-plus start|stop' to start|stop the system-wide instance of TomEE."
+        echo "    CATALINA_HOME=\$CATALINA_HOME"
+        echo "    CATALINA_BASE=\$CATALINA_BASE"
+        exit 1
+    fi
+}
+
 start(){
-   echo "Starting TomEE ${classifier} (version ${tomeeVersion}): "
-   \$CATALINA_HOME/bin/catalina.sh start
-   return \$?
+    checkInstance
+    echo "Starting TomEE ${classifier} (version ${tomeeVersion}): "
+    \$CATALINA_HOME/bin/catalina.sh start
+    return \$?
 }
 
 stop(){
-   echo "Shutting down TomEE ${classifier} (version ${tomeeVersion}): "
-   \$CATALINA_HOME/bin/shutdown.sh
-   return \$?
+    checkInstance
+    echo "Shutting down TomEE ${classifier} (version ${tomeeVersion}): "
+    \$CATALINA_HOME/bin/shutdown.sh
+    return \$?
 }
 
 case \$1 in