--- Cron.sh	Tue Sep 25 11:06:12 2007
+++ Cron.sh.fjo	Tue Sep 25 11:42:47 2007
@@ -21,17 +21,19 @@
 # --
 
 CURRENTUSER=`whoami`
-OTRS_HOME=$HOME
-#CRON_USER=" -u $RUNASUSER ";
-CRON_USER=""
+CRON_USER="$2"
 
-if test $CURRENTUSER = root; then
-    echo "Run this script just as OTRS user! Or use 'Cron.sh {start|stop|restart} OTRS_USER'!"
-    exit 5
+if test -z "$CRON_USER"; then
+	if test $CURRENTUSER = root; then
+    	echo "Run this script just as OTRS user! Or use 'Cron.sh {start|stop|restart} OTRS_USER'!"
+	    exit 5
+	fi
+	CRON_USER="$CURRENTUSER"
 fi
 
 # find otrs root
-#OTRS_ROOT=/usr/local/OpenTRS
+cd "`dirname $0`/../"
+OTRS_HOME="`pwd`"
 if test -e $OTRS_HOME/var/cron; then
     OTRS_ROOT=$OTRS_HOME
 else
@@ -54,7 +56,7 @@
     # start
     # ------------------------------------------------------
     start)
-        if mkdir -p $CRON_DIR; cd $CRON_DIR && ls * |grep -v '.dist'|grep -v '.rpm'| grep -v CVS | grep -v Entries | grep -v Repository | grep -v Root | xargs cat > $CRON_TMP_FILE && crontab $CRON_USER $CRON_TMP_FILE; then
+        if mkdir -p $CRON_DIR; cd $CRON_DIR && ls * |grep -v '.dist'|grep -v '.rpm'| grep -v CVS | grep -v Entries | grep -v Repository | grep -v Root | xargs cat > $CRON_TMP_FILE && crontab -u $CRON_USER $CRON_TMP_FILE; then
             rm -rf $CRON_TMP_FILE
             echo "(using $OTRS_ROOT) done";
             exit 0;
@@ -67,7 +69,7 @@
     # stop
     # ------------------------------------------------------
     stop)
-        if crontab $CRON_USER -r ; then
+        if crontab -u $CRON_USER -r ; then
             echo "done";
             exit 0;
         else