--- loncom/build/distprobe	2009/07/05 23:58:38	1.16
+++ loncom/build/distprobe	2019/05/27 01:26:31	1.22
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.16 2009/07/05 23:58:38 raeburn Exp $
+# $Id: distprobe,v 1.22 2019/05/27 01:26:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,6 +28,7 @@
 #
 
 my $dist='default';
+my $unknown;
 if (-e '/etc/redhat-release') {
     open(IN,'</etc/redhat-release');
     my $versionstring=<IN>;
@@ -53,13 +54,18 @@ if (-e '/etc/redhat-release') {
         $dist = 'rhes'.$1;
     } elsif ($versionstring =~ /Red Hat Enterprise Linux Server release (\d+)/) {
         $dist = 'rhes'.$1;
-    } elsif ($versionstring =~ /CentOS release (\d+)/) {
+    } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) {
+        $dist = 'rhes'.$1;
+    } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
         $dist = 'centos'.$1;
-    } elsif ($versionstring =~ /Scientific Linux SL release ([\d\.]+) /) {
-        $dist = 'scientific'.$1;
+    } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
+        my $ver = $1;
+        $ver =~ s/\.\d+$//;
+        $dist = 'scientific'.$ver;
     } else {
         warn('Unable to interpret /etc/redhat-release '.
              'to determine system type');
+        $unknown = 1;
     }
 } elsif (-e '/etc/SuSE-release') {
     open(IN,'</etc/SuSE-release');
@@ -75,6 +81,7 @@ if (-e '/etc/redhat-release') {
     } else {
         warn('Unable to interpret /etc/SuSE-release '.
              'to determine system type');
+        $unknown = 1;
     }
 } elsif (-e '/etc/issue') {
     open(IN,'</etc/issue');
@@ -95,10 +102,8 @@ if (-e '/etc/redhat-release') {
         } else {
             warn('Unable to interpret /etc/debian_version '.
                  'to determine system type');
+            $unknown = 1;
         }
-    } else {
-        warn('Unable to interpret /etc/issue '.
-             'to determine system type');
     }
 } elsif (-e '/etc/debian_version') {
     open(IN,'</etc/debian_version');
@@ -110,8 +115,36 @@ if (-e '/etc/redhat-release') {
     } else {
         warn('Unable to interpret /etc/debian_version '.
              'to determine system type');
+        $unknown = 1;
+    }
+}
+if (($dist eq 'default') && (!$unknown)) {
+    if (-e '/etc/os-release') {
+        if (open(IN,'<','/etc/os-release')) {
+            my ($id,$version);
+            while(<IN>) {
+                chomp();
+                if (/^ID="(\w+)"/) {
+                    $id=$1;
+                } elsif (/^VERSION_ID="([\d\.]+)"/) {
+                    $version=$1;
+                }
+            }
+            close(IN);
+            if ($id eq 'sles') {
+                my ($major,$minor) = split(/\./,$version);
+                if ($major =~ /^\d+$/) {
+                    $dist = $id.$major;
+                }
+            }
+        }
+        if ($dist eq 'default') {
+            warn('Unable to interpret /etc/os-release '.
+                 'to determine system type.');
+            $unknown = 1;
+        }
+    } else {
+        warn('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora or scientific linux system.')."\n";
     }
-} else {
-    warn('Unknown installation: expecting a debian, suse, or redhat system');
 }
 print $dist;