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

Timestamp:

2014-04-01T01:12:46+02:00 (9 years ago)

Author:

Don-vip

Message:

see #8465 - Ask Linux Mint users to update their Java 6 version to Java 7

File:

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

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

@@ -46 +46 @@
             String os = getOSDescription();
             if (java != null && java.startsWith("1.6") && os != null && (
-                    os.startsWith("Linux Debian GNU/Linux 7") ||
+                    os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") ||
                     os.startsWith("Linux Ubuntu 12") || os.startsWith("Linux Ubuntu 13") || os.startsWith("Linux Ubuntu 14"))) {
                 askUpdateJava(java, "apt://openjdk-7-jre");
@@ -121 +121 @@
 
     /**
-     * Determines if the distribution is Debian or Ubuntu.
-     * @return {@code true} if the distribution is Debian or Ubuntu, {@code false} otherwise
+     * 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);
+            return "Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist) || "Mint".equalsIgnoreCase(dist);
         } catch (IOException e) {
             Main.warn(e);