From d865d41e812abfd4f5cb090a7a3c1ff0bac744e4 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 6 May 2008 09:44:22 +0000 Subject: INTEGRATION: CWS native147 (1.4.2); FILE MERGED 2008/04/25 12:10:42 is 1.4.2.2: #i88334# /opt for linux rpm because of rpm 3 2008/04/21 13:02:19 is 1.4.2.1: #i88334# packages no longer relocatable --- .../org/openoffice/setup/InstallerHelper/LinuxHelper.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'javainstaller2') diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java index 71d0f75522ef..88280b94fb1f 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: LinuxHelper.java,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -421,12 +421,12 @@ import java.util.Vector;public class LinuxHelper { String relocationString = null; if ( packageData.isRelocatable() ) { - // String rpmQuery = "rpm -qp --qf %{PREFIXES}=" + " " + packageName; + // String rpmQuery = "rpm -qp --qf %{PREFIXES}" + " " + packageName; String[] rpmQueryArray = new String[5]; rpmQueryArray[0] = "rpm"; rpmQueryArray[1] = "-qp"; rpmQueryArray[2] = "--qf"; - rpmQueryArray[3] = "%{PREFIXES}="; + rpmQueryArray[3] = "%{PREFIXES}"; rpmQueryArray[4] = packageName; Vector returnVector = new Vector(); @@ -450,9 +450,7 @@ 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 destDir = new File(data.getInstallDir(), data.getProductDir()); - // File uninstallDir = new File(destDirStr, data.getUninstallDirName()); + File destDir = new File(data.getInstallDefaultDir(), data.getProductDir()); File uninstallDir = new File(destDir, data.getUninstallDirName()); String fileName = "packageNames"; File packageNamesFile = new File(uninstallDir, fileName); @@ -475,9 +473,7 @@ import java.util.Vector;public class LinuxHelper { public void saveModulesLogFile(InstallData data) { if ( data.logModuleStates() ) { Vector logContent = LogManager.getModulesLogFile(); - File destDir = new File(data.getInstallDir(), data.getProductDir()); - // String destDirStr = data.getInstallDir(); - // File uninstallDir = new File(destDirStr, data.getUninstallDirName()); + File destDir = new File(data.getInstallDefaultDir(), data.getProductDir()); File uninstallDir = new File(destDir, data.getUninstallDirName()); File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt"); SystemManager.saveCharFileVector(modulesLogFile.getPath(), logContent); -- cgit v1.2.3