CVS:oo-debian-files/bin openoffice,1.31,1.32

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv26977/bin

Modified Files:
	openoffice 
Log Message:
- change $OOHOME/user/basic/script.xlc if we find /usr/lib/openoffice.org1.1
  referenced (closes: #267963) [RE]
- mention that the GNOME and KDE file pickers are disabled by default [RE]
- bump version 


Index: openoffice
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- openoffice	23 Dec 2004 12:23:46 -0000	1.31
+++ openoffice	9 Jan 2005 21:13:01 -0000	1.32
@@ -151,6 +151,16 @@
 
 }
 
+check_and_fix_basic_dir()
+{
+        if [ -e "$OOHOME/user/basic/script.xlc" ] && \
+             grep -q openoffice1.1 $OOHOME/user/basic/script.xlc; then
+                echo "Upgrading script.xlc to correct path..."
+                perl -pi -e s,/usr/lib/openoffice1.1,/usr/lib/openoffice,g \
+                        $OOHOME/user/basic/script.xlc; \
+        fi
+}
+
 ## OOo does not start if /proc is not mounted, so check for it
 if [ ! -f /proc/version ]; then
   echo "openoffice.org:  You must have a working /proc filesystem to use openoffice." >&2
@@ -240,6 +250,7 @@
 
       rm -f $TMPFILE
 
+      check_and_fix_basic_dir
     else
       # first install
       responsefile=/etc/openoffice${VER}/autoresponse.conf
@@ -269,6 +280,10 @@
       exit 1
     fi
     
+    # normally this only is needed on upgrades; but we have broken configs
+    # with that out there...
+    check_and_fix_basic_dir
+
     echo "Setup complete.  Running openoffice.org..."
 
 else