Skip to content

C
core
Kaydet (Commit) 8a395179 authored tarafından Ingo Schmidt's avatar Ingo Schmidt
Dosyalara gözat
Seçenekler

native324 #i113835# preparing rpm installation on debian systems

üst 969f4032
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 58 deletions
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
Dosyayı görüntüle @ 8a395179
...@@ -194,6 +194,7 @@ public class LinuxInstaller extends Installer { ...@@ -194,6 +194,7 @@ public class LinuxInstaller extends Installer {
// is installed. // is installed.
String forceDebianString = ""; String forceDebianString = "";
String nodepsString = "";
if ( ! data.debianInvestigated() ) { if ( ! data.debianInvestigated() ) {
helper.investigateDebian(data); helper.investigateDebian(data);
...@@ -202,6 +203,7 @@ public class LinuxInstaller extends Installer { ...@@ -202,6 +203,7 @@ public class LinuxInstaller extends Installer {
if ( data.isDebianSystem() ) { if ( data.isDebianSystem() ) {
forceDebianString = "--force-debian"; forceDebianString = "--force-debian";
nodepsString = "--nodeps";
} }
String rpmCommand = ""; String rpmCommand = "";
...@@ -226,115 +228,123 @@ public class LinuxInstaller extends Installer { ...@@ -226,115 +228,123 @@ public class LinuxInstaller extends Installer {
if (useForce) { if (useForce) {
if (useLocalDatabase) { if (useLocalDatabase) {
if ( relocations != null ) { if ( relocations != null ) {
rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " +
"--relocate " + relocations + " " + databaseString + "--relocate " + relocations + " " + databaseString +
" " + databasePath + " " + packageName; " " + databasePath + " " + packageName;
rpmCommandArray = new String[11]; rpmCommandArray = new String[12];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = "--force"; rpmCommandArray[3] = "--force";
rpmCommandArray[4] = forceDebianString; rpmCommandArray[4] = forceDebianString;
rpmCommandArray[5] = "-vh"; rpmCommandArray[5] = nodepsString;
rpmCommandArray[6] = "--relocate"; rpmCommandArray[6] = "-vh";
rpmCommandArray[7] = relocations; rpmCommandArray[7] = "--relocate";
rpmCommandArray[8] = databaseString; rpmCommandArray[8] = relocations;
rpmCommandArray[9] = databasePath; rpmCommandArray[9] = databaseString;
rpmCommandArray[10] = packageName; rpmCommandArray[10] = databasePath;
rpmCommandArray[11] = packageName;
} else { } else {
rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " +
databaseString + " " + databasePath + " " + packageName; databaseString + " " + databasePath + " " + packageName;
rpmCommandArray = new String[9]; rpmCommandArray = new String[10];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = "--force"; rpmCommandArray[3] = "--force";
rpmCommandArray[4] = forceDebianString; rpmCommandArray[4] = forceDebianString;
rpmCommandArray[5] = "-vh"; rpmCommandArray[5] = nodepsString;
rpmCommandArray[6] = databaseString; rpmCommandArray[6] = "-vh";
rpmCommandArray[7] = databasePath; rpmCommandArray[7] = databaseString;
rpmCommandArray[8] = packageName; rpmCommandArray[8] = databasePath;
rpmCommandArray[9] = packageName;
} }
} else { } else {
if ( relocations != null ) if ( relocations != null )
{ {
rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " +
"--relocate " + relocations + " " + packageName; "--relocate " + relocations + " " + packageName;
rpmCommandArray = new String[9]; rpmCommandArray = new String[10];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = "--force"; rpmCommandArray[3] = "--force";
rpmCommandArray[4] = forceDebianString; rpmCommandArray[4] = forceDebianString;
rpmCommandArray[5] = "-vh"; rpmCommandArray[5] = nodepsString;
rpmCommandArray[6] = "--relocate"; rpmCommandArray[6] = "-vh";
rpmCommandArray[7] = relocations; rpmCommandArray[7] = "--relocate";
rpmCommandArray[8] = packageName; rpmCommandArray[8] = relocations;
rpmCommandArray[9] = packageName;
} else { } else {
rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " -vh " + packageName; rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " + packageName;
rpmCommandArray = new String[7]; rpmCommandArray = new String[8];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = "--force"; rpmCommandArray[3] = "--force";
rpmCommandArray[4] = forceDebianString; rpmCommandArray[4] = forceDebianString;
rpmCommandArray[5] = "-vh"; rpmCommandArray[5] = nodepsString;
rpmCommandArray[6] = packageName; rpmCommandArray[6] = "-vh";
rpmCommandArray[7] = packageName;
} }
} }
} else { } else {
if (useLocalDatabase) { if (useLocalDatabase) {
if ( relocations != null ) { if ( relocations != null ) {
rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
"--relocate " + relocations + " " + databaseString + "--relocate " + relocations + " " + databaseString +
" " + databasePath + " " + packageName; " " + databasePath + " " + packageName;
rpmCommandArray = new String[10]; rpmCommandArray = new String[11];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = forceDebianString; rpmCommandArray[3] = forceDebianString;
rpmCommandArray[4] = "-vh"; rpmCommandArray[4] = nodepsString;
rpmCommandArray[5] = "--relocate"; rpmCommandArray[5] = "-vh";
rpmCommandArray[6] = relocations; rpmCommandArray[6] = "--relocate";
rpmCommandArray[7] = databaseString; rpmCommandArray[7] = relocations;
rpmCommandArray[8] = databasePath; rpmCommandArray[8] = databaseString;
rpmCommandArray[9] = packageName; rpmCommandArray[9] = databasePath;
rpmCommandArray[10] = packageName;
} else { } else {
rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
databaseString + " " + databasePath + " " + packageName; databaseString + " " + databasePath + " " + packageName;
rpmCommandArray = new String[8]; rpmCommandArray = new String[9];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = forceDebianString; rpmCommandArray[3] = forceDebianString;
rpmCommandArray[4] = "-vh"; rpmCommandArray[4] = nodepsString;
rpmCommandArray[5] = databaseString; rpmCommandArray[5] = "-vh";
rpmCommandArray[6] = databasePath; rpmCommandArray[6] = databaseString;
rpmCommandArray[7] = packageName; rpmCommandArray[7] = databasePath;
rpmCommandArray[8] = packageName;
} }
} else { } else {
if ( relocations != null ) if ( relocations != null )
{ {
rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " -vh " + rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
"--relocate " + relocations + " " + packageName; "--relocate " + relocations + " " + packageName;
rpmCommandArray = new String[8]; rpmCommandArray = new String[9];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = forceDebianString; rpmCommandArray[3] = forceDebianString;
rpmCommandArray[4] = "-vh"; rpmCommandArray[4] = nodepsString;
rpmCommandArray[5] = "--relocate"; rpmCommandArray[5] = "-vh";
rpmCommandArray[6] = relocations; rpmCommandArray[6] = "--relocate";
rpmCommandArray[7] = packageName; rpmCommandArray[7] = relocations;
rpmCommandArray[8] = packageName;
} else { } else {
rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " -vh " + packageName; rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " + packageName;
rpmCommandArray = new String[6]; rpmCommandArray = new String[7];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = "--upgrade"; rpmCommandArray[1] = "--upgrade";
rpmCommandArray[2] = "--ignoresize"; rpmCommandArray[2] = "--ignoresize";
rpmCommandArray[3] = forceDebianString; rpmCommandArray[3] = forceDebianString;
rpmCommandArray[4] = "-vh"; rpmCommandArray[4] = nodepsString;
rpmCommandArray[5] = packageName; rpmCommandArray[5] = "-vh";
rpmCommandArray[6] = packageName;
} }
} }
} }
...@@ -409,6 +419,7 @@ public class LinuxInstaller extends Installer { ...@@ -409,6 +419,7 @@ public class LinuxInstaller extends Installer {
// is installed. // is installed.
String forceDebianString = ""; String forceDebianString = "";
String nodepsString = "";
if ( ! data.debianInvestigated() ) { if ( ! data.debianInvestigated() ) {
helper.investigateDebian(data); helper.investigateDebian(data);
...@@ -417,6 +428,7 @@ public class LinuxInstaller extends Installer { ...@@ -417,6 +428,7 @@ public class LinuxInstaller extends Installer {
if ( data.isDebianSystem() ) { if ( data.isDebianSystem() ) {
forceDebianString = "--force-debian"; forceDebianString = "--force-debian";
nodepsString = "--nodeps";
} }
// Code duplication for isDebianSystem is necessary, because there is no valid position // Code duplication for isDebianSystem is necessary, because there is no valid position
...@@ -425,21 +437,23 @@ public class LinuxInstaller extends Installer { ...@@ -425,21 +437,23 @@ public class LinuxInstaller extends Installer {
if ( data.isDebianSystem() ) { if ( data.isDebianSystem() ) {
if (useLocalDatabase) { if (useLocalDatabase) {
rpmCommand = "rpm " + forceDebianString + " -ev" + " " + databaseString + " " + databasePath + " " + packageName; rpmCommand = "rpm " + forceDebianString + " " + nodepsString + " -ev" + " " + databaseString + " " + databasePath + " " + packageName;
rpmCommandArray = new String[6]; rpmCommandArray = new String[7];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = forceDebianString; rpmCommandArray[1] = forceDebianString;
rpmCommandArray[2] = "-ev"; rpmCommandArray[2] = nodepsString;
rpmCommandArray[3] = databaseString; rpmCommandArray[3] = "-ev";
rpmCommandArray[4] = databasePath; rpmCommandArray[4] = databaseString;
rpmCommandArray[5] = packageName; rpmCommandArray[5] = databasePath;
rpmCommandArray[6] = packageName;
} else { } else {
rpmCommand = "rpm " + forceDebianString + " -ev" + " " + packageName; rpmCommand = "rpm " + forceDebianString + " " + nodepsString + " -ev" + " " + packageName;
rpmCommandArray = new String[4]; rpmCommandArray = new String[5];
rpmCommandArray[0] = "rpm"; rpmCommandArray[0] = "rpm";
rpmCommandArray[1] = forceDebianString; rpmCommandArray[1] = forceDebianString;
rpmCommandArray[2] = "-ev"; rpmCommandArray[2] = nodepsString;
rpmCommandArray[3] = packageName; rpmCommandArray[3] = "-ev";
rpmCommandArray[4] = packageName;
} }
} else { } else {
if (useLocalDatabase) { if (useLocalDatabase) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment