r849 ./packages/openofficeorg/2.3/experimental: fix path; UNO_JAVA_JFW_INSTALL_DATA apparently want file://, too

[Rene Engelhard]

------------------------------------------------------------
revno: 849
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-08-14 18:03:18 +0200
message:
  fix path; UNO_JAVA_JFW_INSTALL_DATA apparently want file://, too
modified:
  shell-lib.sh

=== modified file 'shell-lib.sh'
--- a/shell-lib.sh      2007-08-13 20:36:39 +0000
+++ b/shell-lib.sh      2007-08-14 16:03:18 +0000
@@ -53,21 +53,25 @@
 }
 
 remove_extension() {
-  if /usr/lib/openoffice/program/unopkg list --shared $1; then
+  if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
+    echo -n "Removing extension $1..."
     INSTDIR=`mktemp -d`
     /usr/lib/openoffice/program/unopkg remove --shared $1 \
       "-env:UserInstallation=file:///$INSTDIR" \
-      
"-env:UNO_JAVA_JFW_INSTALL_DATA=/usr/lib/openoffice/program/../share/javasettingsunopkginstall.xml"
+      
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/program/../share/config/javasettingsunopkginstall.xml"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
+    echo " done."
   fi
 }
 
 add_extension() {
+  echo -n "Adding extension $1..."
   INSTDIR=`mktemp -d`
   /usr/lib/openoffice/program/unopkg add --shared $1 \
     "-env:UserInstallation=file:///$INSTDIR" \
-    
"-env:UNO_JAVA_JFW_INSTALL_DATA=/usr/lib/openoffice/program/../share/javasettingsunopkginstall.xml"
+    
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/program/../share/config/javasettingsunopkginstall.xml"
   if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
+  echo " done."
 }
 
 trap "message;\