INTEGRATION: CWS sb83 (1.2.48); FILE MERGED

2008/02/11 16:07:20 is 1.2.48.1: #i86012# Java GUI Installer and three layer office

2 files changed, 15 insertions, 9 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
index 90d0ac393c60..7005558d44eb 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: LinuxHelper.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-03 11:54:40 $
+ *  last change: $Author: vg $ $Date: 2008-03-18 12:14:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -364,7 +364,8 @@ import java.util.Vector;public class LinuxHelper {
     public String getLinuxDatabasePath(InstallData data) {
         String databasePath = null;
         String installDir = data.getInstallDir();
-        String databaseDir = SystemManager.getParentDirectory(installDir);
+        String databaseDir = installDir;
+        // String databaseDir = SystemManager.getParentDirectory(installDir);
         String linuxDatabaseName = ".RPM_OFFICE_DATABASE";
         File databaseFile = new File(databaseDir, linuxDatabaseName);
         databasePath = databaseFile.getPath();
@@ -454,8 +455,10 @@ import java.util.Vector;public class LinuxHelper {
         // The version and release that are also stored in file "packageNames" must not be
         // used for deinstallation because they are probably not up to date.
 
-        String destDirStr = data.getInstallDir();
-        File uninstallDir = new File(destDirStr, data.getUninstallDirName());
+        // String destDirStr = data.getInstallDir();
+        File destDir = new File(data.getInstallDir(), data.getProductDir());
+        // File uninstallDir = new File(destDirStr, data.getUninstallDirName());
+        File uninstallDir = new File(destDir, data.getUninstallDirName());
         String fileName = "packageNames";
         File packageNamesFile = new File(uninstallDir, fileName);
         Vector packageNames = new Vector();
@@ -477,8 +480,10 @@ import java.util.Vector;public class LinuxHelper {
     public void saveModulesLogFile(InstallData data) {
         if ( data.logModuleStates() ) {
             Vector logContent = LogManager.getModulesLogFile();
-            String destDirStr = data.getInstallDir();
-            File uninstallDir = new File(destDirStr, data.getUninstallDirName());
+            File destDir = new File(data.getInstallDir(), data.getProductDir());
+            // String destDirStr = data.getInstallDir();
+            // File uninstallDir = new File(destDirStr, data.getUninstallDirName());
+            File uninstallDir = new File(destDir, data.getUninstallDirName());
             File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");
             SystemManager.saveCharFileVector(modulesLogFile.getPath(), logContent);
         }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
index 25b3a9887a6e..591936283bbd 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: SolarisHelper.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-03 11:54:52 $
+ *  last change: $Author: vg $ $Date: 2008-03-18 12:15:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -246,6 +246,7 @@ public class SolarisHelper {
         if ( data.logModuleStates() ) {
             Vector logContent = LogManager.getModulesLogFile();
             File baseDir = new File(data.getInstallRoot(), data.getInstallDir());
+            baseDir = new File(baseDir, data.getProductDir());
             File uninstallDir = new File(baseDir, data.getUninstallDirName());
             File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");
             // System.err.println("Saving file: " + modulesLogFile.getPath());