IssueZilla 10518 - Install BeanShell UNO package with installer

1 files changed, 7 insertions, 22 deletions

diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java
index d2544e90aa27..0f8ba7b115d2 100644
--- a/scripting/workben/installer/XmlUpdater.java
+++ b/scripting/workben/installer/XmlUpdater.java
@@ -184,6 +184,13 @@ public class XmlUpdater extends Thread {
             return;
     }
 
+        if (!zd.extractEntry("sframework/bshruntime.zip",progpath, statusLabel))
+        {
+            onInstallComplete();
+            return;
+    }
+
+    // Check for OpenOffice Scxripting Security Resource
     // Check for OpenOffice Scxripting Security Resource
         if (!zd.extractEntry("sframework/scripting64301.res",progpath+"resource"+File.separator, statusLabel))
         {
@@ -195,28 +202,6 @@ public class XmlUpdater extends Thread {
         }
     }
 
-    if (opSys.indexOf("Windows")!=-1){
-            if (!zd.extractEntry("windows/regsingleton.exe",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-        else if (opSys.indexOf("Linux")!=-1){
-            if (!zd.extractEntry("linux_x86/regsingleton",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-        else if (opSys.indexOf("SunOS")!=-1){
-            if (!zd.extractEntry("solaris_sparc/regsingleton",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-
 //--------------------------------
 // Robert Kinsella test 2