Changeset 7318 in josm for trunk/src/org

Timestamp:

2014-07-19T21:12:28+02:00 (10 years ago)

Author:

stoecker

Message:

see #10272 - improve version checks for RPM based distros

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -86 +86 @@
         text.append("\n");
         if (Main.platform.getClass() == PlatformHookUnixoid.class) {
-            // Add Java package details for Debian/Ubuntu
+            // Add Java package details
             String packageDetails = ((PlatformHookUnixoid) Main.platform).getJavaPackageDetails();
             if (packageDetails != null) {
@@ -93 +93 @@
                 text.append("\n");
             }
-            // Add WebStart package details for Debian/Ubuntu, if run from JNLP
+            // Add WebStart package details if run from JNLP
             if (Package.getPackage("javax.jnlp") != null) {
                 String webStartDetails = ((PlatformHookUnixoid) Main.platform).getWebStartPackageDetails();

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -133 +133 @@
         try {
             boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query"));
-            boolean rpm  = Files.exists(Paths.get("/usr/bin/rpm"));
+            boolean rpm  = Files.exists(Paths.get("/bin/rpm"));
             if (dpkg || rpm) {
                 for (String packageName : packageNames) {
@@ -143 +143 @@
                     }
                     String version = Utils.execOutput(Arrays.asList(args));
-                    if (version != null) {
+                    if (version != null && !version.contains("not installed")) {
                         return packageName + ":" + version;
                     }
@@ -163 +163 @@
      */
     public String getJavaPackageDetails() {
-        switch(System.getProperty("java.home")) {
-        case "/usr/lib/jvm/java-7-openjdk-amd64/jre":
-        case "/usr/lib/jvm/java-7-openjdk-i386/jre":
-        case "/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/jre":
-        case "/usr/lib/jvm/java-1.7.0-openjdk-1.7.0/jre":
-            return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk");
+        String home = System.getProperty("java.home");
+        if(home.contains("java-7-openjdk") || home.contains("java-1.7.0-openjdk")) {
+            return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk", "java-1.7.0-openjdk");
         }
         return null;