You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by to...@apache.org on 2015/03/21 09:44:40 UTC

svn commit: r1668209 - /sling/trunk/contrib/sling-s3/scripts/crankstart.sh

Author: tomekr
Date: Sat Mar 21 08:44:40 2015
New Revision: 1668209

URL: http://svn.apache.org/r1668209
Log:
SLING-4502 Allow to use alternative runner in the crankstart.sh

Modified:
    sling/trunk/contrib/sling-s3/scripts/crankstart.sh

Modified: sling/trunk/contrib/sling-s3/scripts/crankstart.sh
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/scripts/crankstart.sh?rev=1668209&r1=1668208&r2=1668209&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/scripts/crankstart.sh (original)
+++ sling/trunk/contrib/sling-s3/scripts/crankstart.sh Sat Mar 21 08:44:40 2015
@@ -10,4 +10,9 @@ REPO="https://repository.apache.org/cont
 REPO="${REPO},http://repo1.maven.org/maven2/@id=central"
 MVN_OPTS="${MVN_OPTS} -Dorg.ops4j.pax.url.mvn.repositories=${REPO}"
 
-java ${MVN_OPTS} -jar contrib/crankstart.jar "$@"
+# If CRANKSTART_ENV is set, don't start anything.
+# This lets alternate start mechanisms source all settings in this file then use an alternate exec method,
+# like start-stop-daemon, which doesn't work well with shell script when additional args are needed.
+if [ ! "${CRANKSTART_ENV}" ] ; then
+       java ${MVN_OPTS} -jar contrib/crankstart.jar "$@"
+fi