You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/11/15 21:31:34 UTC

svn commit: r1035430 - /karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service

Author: gnodet
Date: Mon Nov 15 20:31:34 2010
New Revision: 1035430

URL: http://svn.apache.org/viewvc?rev=1035430&view=rev
Log:
[KARAF-270] karaf-service scripts tries to create 'data' directory in wrong location

Modified:
    karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service

Modified: karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service?rev=1035430&r1=1035429&r2=1035430&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-service Mon Nov 15 20:31:34 2010
@@ -29,6 +29,9 @@ WRAPPER_CONF="${karaf.base}/etc/${APP_NA
 #  nice is only used if a priority is specified.
 PRIORITY=
 
+# Location of the data folder.
+DATADIR="${karaf.data}"
+
 # Location of the pid file.
 PIDDIR="${karaf.data}"
 
@@ -393,11 +396,11 @@ start() {
     getpid
     if [ "X$pid" = "X" ]
     then
-        if [ ! -d ../../data ]; then
-            mkdir ../../data
+        if [ ! -d $DATADIR ]; then
+            mkdir $DATADIR
         fi
-        if [ ! -d ../../data/log ]; then
-            mkdir ../../data/log
+        if [ ! -d $DATADIR/log ]; then
+            mkdir $DATADIR/log
         fi
         COMMAND_LINE="$CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.syslog.ident=$APP_NAME wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
         exec $COMMAND_LINE