Changeset 6953 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2014-04-01T01:12:46+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
r6952 r6953 46 46 String os = getOSDescription(); 47 47 if (java != null && java.startsWith("1.6") && os != null && ( 48 os.startsWith("Linux Debian GNU/Linux 7") || 48 os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") || 49 49 os.startsWith("Linux Ubuntu 12") || os.startsWith("Linux Ubuntu 13") || os.startsWith("Linux Ubuntu 14"))) { 50 50 askUpdateJava(java, "apt://openjdk-7-jre"); … … 121 121 122 122 /** 123 * Determines if the distribution is Debian or Ubuntu .124 * @return {@code true} if the distribution is Debian or Ubuntu, {@code false} otherwise123 * Determines if the distribution is Debian or Ubuntu, or a derivative. 124 * @return {@code true} if the distribution is Debian, Ubuntu or Mint, {@code false} otherwise 125 125 */ 126 126 public static boolean isDebianOrUbuntu() { 127 127 try { 128 128 String dist = Utils.execOutput(Arrays.asList("lsb_release", "-i", "-s")); 129 return "Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist) ;129 return "Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist) || "Mint".equalsIgnoreCase(dist); 130 130 } catch (IOException e) { 131 131 Main.warn(e);
Note: See TracChangeset
for help on using the changeset viewer.