Repository: karaf Updated Branches: refs/heads/master 6c55a3d6a -> 4aad87bf9
KARAF-4294 - System scripts: Improove support for Solaris 10 init scripts Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ca185460 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ca185460 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ca185460 Branch: refs/heads/master Commit: ca1854607d47ce3e40f56cad713ae7d4299fce53 Parents: 2af4c10 Author: lburgazzoli <[email protected]> Authored: Mon Jan 25 18:14:58 2016 +0100 Committer: lburgazzoli <[email protected]> Committed: Mon Jan 25 18:14:58 2016 +0100 ---------------------------------------------------------------------- .../bin/contrib/karaf-service-template.init | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ca185460/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service-template.init ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service-template.init b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service-template.init index 7c8bbbe..60e0cb4 100644 --- a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service-template.init +++ b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service-template.init @@ -21,6 +21,13 @@ # config: ${KARAF_SERVICE_CONF} # +if [ -r "${KARAF_SERVICE_CONF}" ]; then + . "${KARAF_SERVICE_CONF}" +else + echo "Error KARAF_SERVICE_CONF not defined" + exit -1 +fi + # Location of JDK if [ -n "$JAVA_HOME" ]; then export JAVA_HOME @@ -35,13 +42,6 @@ if [ -z "$JAVA" ]; then fi fi -if [ -r "${KARAF_SERVICE_CONF}" ]; then - . "${KARAF_SERVICE_CONF}" -else - echo "Error KARAF_SERVICE_CONF not defined" - exit -1 -fi - if [ -z "$STARTUP_WAIT" ]; then STARTUP_WAIT=30 fi @@ -51,7 +51,6 @@ if [ -z "$SHUTDOWN_WAIT" ]; then fi prog=${KARAF_SERVICE_NAME} -currenttime=$(date +%s%N | cut -b1-13) do_start() { echo "Starting $prog: " @@ -65,16 +64,16 @@ do_start() { fi fi - mkdir -p $(dirname $KARAF_SERVICE_LOG) + mkdir -p `dirname $KARAF_SERVICE_LOG` cat /dev/null > $KARAF_SERVICE_LOG chown $KARAF_SERVICE_USER:$KARAF_SERVICE_GROUP $KARAF_SERVICE_LOG - mkdir -p $(dirname $KARAF_SERVICE_PIDFILE) - chown $KARAF_SERVICE_USER:$KARAF_SERVICE_GROUP $(dirname $KARAF_SERVICE_PIDFILE) || true + mkdir -p `dirname $KARAF_SERVICE_PIDFILE` + chown $KARAF_SERVICE_USER:$KARAF_SERVICE_GROUP `dirname $KARAF_SERVICE_PIDFILE` || true if [ ! -z "$KARAF_SERVICE_USER" ]; then su - $KARAF_SERVICE_USER \ - -c " { $KARAF_SERVICE_PATH/bin/$KARAF_SERVICE_EXECUTABLE daemon >> $KARAF_SERVICE_LOG 2>&1 & } ; echo \$! >| $KARAF_SERVICE_PIDFILE " + -c " { export JAVA_HOME=$JAVA_HOME; $KARAF_SERVICE_PATH/bin/$KARAF_SERVICE_EXECUTABLE daemon >> $KARAF_SERVICE_LOG 2>&1 & } ; echo \$! >| $KARAF_SERVICE_PIDFILE " sleep 1 if [ -f $KARAF_SERVICE_PIDFILE ]; then @@ -92,15 +91,15 @@ do_stop() { if [ -f $KARAF_SERVICE_PIDFILE ]; then read kpid < $KARAF_SERVICE_PIDFILE - let kwait=$SHUTDOWN_WAIT + kwait=$SHUTDOWN_WAIT su - $KARAF_SERVICE_USER \ - -c "$KARAF_SERVICE_PATH/bin/$KARAF_SERVICE_EXECUTABLE stop >> $KARAF_SERVICE_LOG 2>&1" + -c "export JAVA_HOME=$JAVA_HOME; $KARAF_SERVICE_PATH/bin/$KARAF_SERVICE_EXECUTABLE stop >> $KARAF_SERVICE_LOG 2>&1" until [ `ps -p $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` -eq '0' ] || [ $count -gt $kwait ] do sleep 1 - let count=$count+1; + count=`expr $count + 1` done if [ $count -gt $kwait ]; then
