diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-09-14 12:00:24 +0200 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-09-14 12:00:24 +0200 |
| commit | df0e1b8fa698daf2a44c6b7b34e7fdd9d27d76f4 (patch) | |
| tree | 9e053b7ad070429eeba6a7bd4c56cff8b66716ca /javainstaller2 | |
| parent | 73971533746918e0776508c0e7d20fd4e34caa61 (diff) | |
native330 #i114487# fixing installation on Cent OS
Diffstat (limited to 'javainstaller2')
3 files changed, 5 insertions, 4 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java index 74cc40bf08b4..358ebd489db4 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java @@ -76,7 +76,7 @@ public class InstallData static private boolean useRtl = false; static private boolean installedProductMinorSet = false; static private boolean isDebianSystem = false; - static private boolean useForceDebian = false; + static private boolean useForceDebian = false; /* --force-debian */ static private boolean debianInvestigated = false; static private String installType; /* custom or typical installation */ static private String osType; /* Linux, SunOS, ... */ diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java index 580911cebc5a..4383904569c0 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java @@ -227,7 +227,7 @@ public class LinuxInstaller extends Installer { } // Defining a Vector that contains the full rpm command. Then the string array can be - // created dynamically. + // created dynamically. Otherwise there would be too many different scenarios. Vector rpmVector = new Vector(); @@ -361,7 +361,7 @@ public class LinuxInstaller extends Installer { } // Defining a Vector that contains the full rpm command. Then the string array can be - // created dynamically. + // created dynamically. Otherwise there would be too many different scenarios. Vector rpmVector = new Vector(); diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java index fc16b5adcf3b..91e8463fdc03 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java @@ -391,7 +391,8 @@ import java.util.Vector;public class LinuxHelper { data.setIsDebianSystem(true); - // Second check: If this is a Debian system, is "--force-debian" required? + // Second check: If this is a Debian system, is "--force-debian" required? Older + // versions do not support "--force-debian". // String rpmQuery = "rpm --help; String[] rpmQueryArray = new String[2]; |