[Erp5-report] r15081 - /erp5/trunk/utils/oood/oood.rc

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sat Jun 30 00:08:34 2007
New Revision: 15081

URL: http://svn.erp5.org?rev=15081&view=rev
Log:
patch OOo in initscript file instead of in %post and %preun

Modified:
    erp5/trunk/utils/oood/oood.rc

Modified: erp5/trunk/utils/oood/oood.rc
URL: http://svn.erp5.org/erp5/trunk/utils/oood/oood.rc?rev=15081&r1=15080&r2=15081&view=diff
==============================================================================
--- erp5/trunk/utils/oood/oood.rc (original)
+++ erp5/trunk/utils/oood/oood.rc Sat Jun 30 00:08:34 2007
@@ -40,12 +40,13 @@
 OOOD_CONFIG_FILE=/etc/oood/oood.conf  #change this if want to use another config file
 HOME=$(awk -F= ' /^oood_home/ { print $2 }' $OOOD_CONFIG_FILE )
 RUNDIR=$(awk -F= ' /^run_dir/ { print $2 }' $OOOD_CONFIG_FILE ) 
-MAX_WAIT_TIME=120   #Maksimum time to wait for the server to create pid file 
+UNOPATH=$(awk -F= ' /^uno_path/ { print $2 }' $OOOD_CONFIG_FILE )
+MAX_WAIT_TIME=120   #Maximum time to wait for the server to create pid file
 
 MAX_RETRYS=$(($MAX_WAIT_TIME/5))
 LOCKFILE=$RUNDIR/server_pid.lock
 PIDFILE=$LOCKFILE
-PYTHON=python
+PYTHON=python2.4
 
 start() {
   if [ -f $LOCKFILE ] ; then
@@ -54,6 +55,9 @@
     echo
     exit 4
   fi
+
+  # Silent patch: Bypass the openoffice registration screen.
+  patch -t $UNOPATH/../share/registry/data/org/openoffice/Setup.xcu -i $HOME/patches/openoffice.org-2.0.3-skip-registration.patch >& /dev/null
 
   gprintf "Starting %s: " "$NAME"
   # Start the server in the background