8278549: UNIX sun/font coding misses SUSE distro detection on recent …

…distro SUSE 15

Reviewed-by: mdoerr
Backport-of: 84976b45315feb6c37a9f3db6e1e62812c9b0a37

src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -294,6 +294,12 @@ private String getVersionString(File f) {
         return null;
     }
 
+    private String extractOsInfo(String s) {
+        if (s.startsWith("\"")) s = s.substring(1);
+        if (s.endsWith("\"")) s = s.substring(0, s.length()-1);
+        return s;
+    }
+
     /**
      * Sets the OS name and version from environment information.
      */
@@ -328,6 +334,16 @@ protected void setOsNameAndVersion() {
             } else if ((f = new File("/etc/fedora-release")).canRead()) {
                 osName = "Fedora";
                 osVersion = getVersionString(f);
+            } else if ((f = new File("/etc/os-release")).canRead()) {
+                Properties props = new Properties();
+                try (FileInputStream fis = new FileInputStream(f)) {
+                    props.load(fis);
+                }
+                osName = props.getProperty("NAME");
+                osVersion = props.getProperty("VERSION_ID");
+                osName = extractOsInfo(osName);
+                if (osName.equals("SLES")) osName = "SuSE";
+                osVersion = extractOsInfo(osVersion);
             }
         } catch (Exception e) {
             if (FontUtilities.debugFonts()) {

src/java.desktop/unix/classes/sun/font/MFontConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,6 +112,16 @@ protected void setOsNameAndVersion(){
                     props.load(new FileInputStream(f));
                     osName = props.getProperty("DISTRIB_ID");
                     osVersion =  props.getProperty("DISTRIB_RELEASE");
+                } else if ((f = new File("/etc/os-release")).canRead()) {
+                    Properties props = new Properties();
+                    try (FileInputStream fis = new FileInputStream(f)) {
+                        props.load(fis);
+                    }
+                    osName = props.getProperty("NAME");
+                    osVersion = props.getProperty("VERSION_ID");
+                    osName = extractOsInfo(osName);
+                    if (osName.equals("SLES")) osName = "SuSE";
+                    osVersion = extractOsInfo(osVersion);
                 }
             } catch (Exception e) {
             }
@@ -132,6 +142,12 @@ private String getVersionString(File f){
         return null;
     }
 
+    private String extractOsInfo(String s) {
+        if (s.startsWith("\"")) s = s.substring(1);
+        if (s.endsWith("\"")) s = s.substring(0, s.length()-1);
+        return s;
+    }
+
     private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
 
     protected String mapFileName(String fileName) {