mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

native330 #i114487# fixing installation on Cent OS

Browse Source
This commit is contained in:
Ingo Schmidt
2010-09-14 12:00:24 +02:00
parent 7397153374
commit df0e1b8fa6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
View File

@@ -76,7 +76,7 @@ public class InstallData
static private boolean useRtl = false; static private boolean useRtl = false;
static private boolean installedProductMinorSet = false; static private boolean installedProductMinorSet = false;
static private boolean isDebianSystem = 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 boolean debianInvestigated = false;
static private String installType; /* custom or typical installation */ static private String installType; /* custom or typical installation */
static private String osType; /* Linux, SunOS, ... */ static private String osType; /* Linux, SunOS, ... */

4
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
View File

@@ -227,7 +227,7 @@ public class LinuxInstaller extends Installer {
} }
// Defining a Vector that contains the full rpm command. Then the string array can be // 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(); 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 // 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(); Vector rpmVector = new Vector();

3
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
View File

@@ -391,7 +391,8 @@ import java.util.Vector;public class LinuxHelper {
data.setIsDebianSystem(true); 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 rpmQuery = "rpm --help;
String[] rpmQueryArray = new String[2]; String[] rpmQueryArray = new String[2];