Changeset 7314 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-07-18T22:27:52+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10272 - refactor Linux package info retrieval to work on more distributions than Debian/Ubuntu. Only relies on presence of dpkg-query or rpm instead of distribution name

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (7 diffs)

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

@@ -16 +16 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -113 +115 @@
 
     /**
-     * Determines if the distribution is Debian or Ubuntu, or a derivative.
-     * @return {@code true} if the distribution is Debian, Ubuntu or Mint, {@code false} otherwise
-     */
-    public static boolean isDebianOrUbuntu() {
-        try {
-            String dist = Utils.execOutput(Arrays.asList("lsb_release", "-i", "-s"));
-            return "Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist) || "Mint".equalsIgnoreCase(dist);
-        } catch (IOException e) {
-            Main.warn(e);
-            return false;
-        }
-    }
-
-    /**
      * Determines if the JVM is OpenJDK-based.
      * @return {@code true} if {@code java.home} contains "openjdk", {@code false} otherwise
@@ -138 +126 @@
     /**
      * Get the package name including detailed version.
-     * @param packageName The package name
+     * @param packageNames The possible package names (when a package can have different names on different distributions)
      * @return The package name and package version if it can be identified, null otherwise
-     */
-    public static String getPackageDetails(String packageName) {
+     * @since 7314
+     */
+    public static String getPackageDetails(String ... packageNames) {
         try {
-            String version = Utils.execOutput(Arrays.asList(
-                    "dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", packageName));
-            if (version != null) {
-                return packageName + ":" + version;
+            boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query"));
+            boolean rpm  = Files.exists(Paths.get("/usr/bin/rpm"));
+            if (dpkg || rpm) {
+                for (String packageName : packageNames) {
+                    String[] args = null;
+                    if (dpkg) {
+                        args = new String[] {"dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", packageName};
+                    } else {
+                        args = new String[] {"rpm", "-q", "--qf", "%{arch}-%{version}", packageName};
+                    }
+                    String version = Utils.execOutput(Arrays.asList(args));
+                    if (version != null) {
+                        return packageName + ":" + version;
+                    }
+                }
             }
         } catch (IOException e) {
@@ -160 +160 @@
      * to the Java version, we also need the exact package version.
      *
-     * This was originally written for #8921, so only Debian based distributions
-     * are covered at the moment. This can be extended to other distributions
-     * if needed.
-     *
-     * @return The package name and package version if it can be identified, null
-     * otherwise
+     * @return The package name and package version if it can be identified, null otherwise
      */
     public String getJavaPackageDetails() {
-        if (isDebianOrUbuntu()) {
-            switch(System.getProperty("java.home")) {
-            case "/usr/lib/jvm/java-7-openjdk-amd64/jre":
-            case "/usr/lib/jvm/java-7-openjdk-i386/jre":
-                return getPackageDetails("openjdk-7-jre");
-            }
+        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");
         }
         return null;
@@ -181 +176 @@
      * Get the Web Start package name including detailed version.
      *
-     * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package,
-     * but its version does not match main java package version.
-     *
-     * Only Debian based distributions are covered at the moment.
-     * This can be extended to other distributions if needed.
+     * OpenJDK packages are shipped with icedtea-web package,
+     * but its version generally does not match main java package version.
      *
      * Simply return {@code null} if there's no separate package for Java WebStart.
@@ -192 +184 @@
      */
     public String getWebStartPackageDetails() {
-        if (isDebianOrUbuntu() && isOpenJDK()) {
-            return getPackageDetails("icedtea-netx");
+        if (isOpenJDK()) {
+            return getPackageDetails("icedtea-netx", "icedtea-web");
         }
         return null;
@@ -224 +216 @@
                         new LinuxReleaseInfo("/etc/fedora-release"),
                         new LinuxReleaseInfo("/etc/gentoo-release"),
-                        new LinuxReleaseInfo("/etc/redhat-release")
+                        new LinuxReleaseInfo("/etc/redhat-release"),
+                        new LinuxReleaseInfo("/etc/SuSE-release")
                 }) {
                     String description = info.extractDescription();