Ignore:
Timestamp:
2014-07-19T21:12:28+02:00 (11 years ago)
Author:
stoecker
Message:

see #10272 - improve version checks for RPM based distros

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r7315 r7318  
    133133        try {
    134134            boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query"));
    135             boolean rpm  = Files.exists(Paths.get("/usr/bin/rpm"));
     135            boolean rpm  = Files.exists(Paths.get("/bin/rpm"));
    136136            if (dpkg || rpm) {
    137137                for (String packageName : packageNames) {
     
    143143                    }
    144144                    String version = Utils.execOutput(Arrays.asList(args));
    145                     if (version != null) {
     145                    if (version != null && !version.contains("not installed")) {
    146146                        return packageName + ":" + version;
    147147                    }
     
    163163     */
    164164    public String getJavaPackageDetails() {
    165         switch(System.getProperty("java.home")) {
    166         case "/usr/lib/jvm/java-7-openjdk-amd64/jre":
    167         case "/usr/lib/jvm/java-7-openjdk-i386/jre":
    168         case "/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/jre":
    169         case "/usr/lib/jvm/java-1.7.0-openjdk-1.7.0/jre":
    170             return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk");
     165        String home = System.getProperty("java.home");
     166        if(home.contains("java-7-openjdk") || home.contains("java-1.7.0-openjdk")) {
     167            return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk", "java-1.7.0-openjdk");
    171168        }
    172169        return null;
Note: See TracChangeset for help on using the changeset viewer.