--- loncom/build/distprobe	2009/06/28 14:22:04	1.15
+++ loncom/build/distprobe	2021/12/21 13:57:47	1.26
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.15 2009/06/28 14:22:04 raeburn Exp $
+# $Id: distprobe,v 1.26 2021/12/21 13:57:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,7 +28,16 @@
 #
 
 my $dist='default';
-if (-e '/etc/redhat-release') {
+my $unknown;
+if (-e '/etc/oracle-release') {
+    open(IN,'</etc/oracle-release');
+    my $versionstring=<IN>;
+    chomp($versionstring);
+    close(IN);
+    if ($versionstring =~ /^Oracle Linux Server release (\d+)/) {
+        $dist = 'oracle'.$1;
+    }
+} elsif (-e '/etc/redhat-release') {
     open(IN,'</etc/redhat-release');
     my $versionstring=<IN>;
     chomp($versionstring);
@@ -53,13 +62,45 @@ 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+)/) {
-        $dist = 'centos'.$1;
-    } elsif ($versionstring =~ /Scientific Linux SL release ([\d\.]+) /) {
-        $dist = 'scientific'.$1;
+    } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) {
+        $dist = 'rhes'.$1;
+    } elsif ($versionstring =~ /CentOS(| Linux| Stream) release (\d+)/) {
+        $dist = 'centos'.$2;
+        if ($1 eq ' Stream') {
+            $dist .= '-stream';
+        }
+    } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
+        my $ver = $1;
+        $ver =~ s/\.\d+$//;
+        $dist = 'scientific'.$ver;
+    } elsif ($versionstring =~ /Rocky Linux release ([\d.]+)/) {
+        my $ver = $1;
+        $ver =~ s/\.\d+$//;
+        $dist = 'rocky'.$ver;
+    } elsif ($versionstring =~ /AlmaLinux release ([\d.]+)/) {
+        my $ver = $1;
+        $ver =~ s/\.\d+$//;
+        $dist = 'alma'.$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');
+    my $versionstring=<IN>;
+    chomp($versionstring);
+    close(IN);
+    if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
+        $dist='sles'.$1;
+    } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
+        $dist = 'suse'.$1;
+    } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
+        $dist = 'suse'.$1;
+    } else {
+        warn('Unable to interpret /etc/SuSE-release '.
+             'to determine system type');
+        $unknown = 1;
     }
 } elsif (-e '/etc/issue') {
     open(IN,'</etc/issue');
@@ -80,10 +121,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');
@@ -95,23 +134,36 @@ if (-e '/etc/redhat-release') {
     } else {
         warn('Unable to interpret /etc/debian_version '.
              'to determine system type');
+        $unknown = 1;
     }
-} elsif (-e '/etc/SuSE-release') {
-    open(IN,'</etc/SuSE-release');
-    my $versionstring=<IN>;
-    chomp($versionstring);
-    close(IN);
-    if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
-        $dist='sles'.$1;
-    } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
-        $dist = 'suse'.$1;
-    } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
-        $dist = 'suse'.$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('Unable to interpret /etc/SuSE-release '.
-             'to determine system type');
+        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;
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>