git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1239 d1b88da0-ebda-0310...

diff --git a/Scripts/sogod-0.9-debian b/Scripts/sogod-0.9-debian
deleted file mode 100755 (executable)
index c109232..0000000
--- a/Scripts/sogod-0.9-debian
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# SOGo daemon wrapper
-#
-# Copyright (C) 2007 Inverse groupe conseil
-#
-# Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-PIDFILE=/var/run/sogo/sogod.$1
-
-. /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
-
-echo $$ > $PIDFILE
-
-startport=`defaults read sogod-0.9 WOPort`
-if [ "$?" == "0" ]
-then
-  startport=`echo $startport | awk '{print $3}'`
-else
-  startport=20000
-fi
-
-let "port=$startport + $1 - 1"
-exec $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 -WOPort $port >& /var/log/sogo/sogod-$port.log

diff --git a/Scripts/sogod-0.9-redhat b/Scripts/sogod-wrapper
similarity index 81%
rename from Scripts/sogod-0.9-redhat
rename to Scripts/sogod-wrapper
index 43357c3def3435298400c357dacce1fd8508d9ca..5c225e6e7042dfe729383cd05fcffc0c690eb187 100755 (executable)
--- a/Scripts/sogod-0.9-redhat
+++ b/Scripts/sogod-wrapper
@@ -23,7 +23,12 @@
 
 PIDFILE=/var/run/sogo/sogod.$1
 
-. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+if [ -d /usr/lib/GNUstep ]
+then
+  . /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
+else
+  . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+fi
 
 if [ -f $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9"
@@ -44,5 +49,11 @@ else
   startport=20000
 fi
 
-let "port=$startport + $1 - 1"
-exec $sogod -WOPort $port >& /var/log/sogo/sogod-$port.log &
+if [ -z "$1" ]
+then
+  port=$startport
+else
+  let "port=$startport + $1 - 1"
+fi
+
+exec $sogod -WOPort $port >> /var/log/sogo/sogod-$port.log 2>&1 &