summaryrefslogtreecommitdiff
path: root/javainstaller2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-06 09:47:22 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-06 09:47:22 +0000
commit84839627937ec002624f6d3cb97cb930a83cabec (patch)
tree4d66a7e68647dc5da66743071c3f79f87750da84 /javainstaller2
parent9f9f7f4e2a5d73846f8f9b7756a832944cfa0844 (diff)
INTEGRATION: CWS native147 (1.4.2); FILE MERGED
2008/04/21 13:02:20 is 1.4.2.1: #i88334# packages no longer relocatable
Diffstat (limited to 'javainstaller2')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java16
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java11
2 files changed, 14 insertions, 13 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java
index 4d04c97f1e30..4342175925ee 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: InfoDir.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -50,8 +50,7 @@ public class InfoDir {
String sourceFile = sourceFileFile.getPath();
// String jarFileName = jarFile.getName();
- File destDir = new File(data.getInstallRoot(), data.getInstallDir());
- destDir = new File(destDir, data.getProductDir());
+ File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());
File destFileFile = new File(destDir, fileName);
destFile = destFileFile.getPath();
@@ -98,11 +97,10 @@ public class InfoDir {
static private File createUninstallDir() {
InstallData data = InstallData.getInstance();
- File baseDir = new File(data.getInstallRoot(), data.getInstallDir());
- baseDir = new File(baseDir, data.getProductDir());
- File uninstallDir = new File(baseDir, data.getUninstallDirName());
- uninstallDir.mkdir();
- return uninstallDir;
+ File baseDir = new File(data.getInstallDefaultDir(), data.getProductDir());
+ baseDir = new File(baseDir, data.getUninstallDirName());
+ baseDir.mkdir();
+ return baseDir;
}
static private void copyGetUidSoFile(File dir) {
@@ -185,8 +183,6 @@ public class InfoDir {
fileContent.add(line);
line = "InstallationDir=" + data.getInstallDir();
fileContent.add(line);
- line = "InstallationRoot=" + data.getInstallRoot();
- fileContent.add(line);
line = "DatabasePath=" + data.getDatabasePath();
fileContent.add(line);
line = "GetUidFile=" + data.getGetUidPath();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java
index 58a0e876ce98..8cd96537e5da 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: InstallChangeCtrl.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -59,8 +59,13 @@ public class InstallChangeCtrl {
static private void setChangeInstallDir(InstallData installData, Installer installer) {
// setting the new install dir after analyzing the installation directory
// of the installed update package.
- String changeInstallDir = installer.getChangeInstallDir(installData.getUpdatePackage());
- installData.setInstallDir(changeInstallDir);
+ if ( installData.isRootInstallation() ) {
+ String changeInstallDir = "/";
+ installData.setInstallDir(changeInstallDir);
+ } else {
+ String changeInstallDir = installer.getChangeInstallDir(installData.getUpdatePackage());
+ installData.setInstallDir(changeInstallDir);
+ }
}
// static public void checkInstallChange(InstallData data, ChooseDirectory panel) {