loncom/build/distprobe - diff

Return to distprobe CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/distprobe between versions 1.14 and 1.21

-version 1.14, 2007/06/28 13:30:06
+version 1.21, 2018/10/17 14:33:49
  Line 28
  #
  my $dist='default';
+ my $unknown;
  if (-e '/etc/redhat-release') {
      open(IN,'</etc/redhat-release');
      my $versionstring=<IN>;
- Line 53  if (-e '/etc/redhat-release') {
+ Line 54  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 =~ /CentOS(?:| Linux) release (\d+)/) {
          $dist = 'centos'.$1;
-     } elsif ($versionstring =~ /Scientific Linux SL release ([\d\.]+) /) {
+     } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
-         $dist = 'scientific'.$1;
+         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/debian_version') {
-     open(IN,'</etc/debian_version');
-     my $version=<IN>;
-     chomp($version);
-     close(IN);
-     if ($version eq '2.2') {
- 	$dist='debian2.2';
      }
  } elsif (-e '/etc/SuSE-release') {
      open(IN,'</etc/SuSE-release');
- Line 83  if (-e '/etc/redhat-release') {
+ Line 79  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');
+     my $versionstring=<IN>;
+     chomp($versionstring);
+     close(IN);
+     if ($versionstring =~ /^Ubuntu (\d+)\.\d+/i) {
+         $dist = 'ubuntu'.$1;
+     } elsif ($versionstring =~ /^Debian\s+GNU\/Linux\s+(\d+)\.\d+/i) {
+         $dist = 'debian'.$1;
+     } elsif (-e '/etc/debian_version') {
+         open(IN,'</etc/debian_version');
+         my $version=<IN>;
+         chomp($version);
+         close(IN);
+         if ($version =~  /^(\d+)\.\d+\.?\d*/) {
+             $dist='debian'.$1;
+         } else {
+             warn('Unable to interpret /etc/debian_version '.
+                  'to determine system type');
+             $unknown = 1;
+         }
+     }
+ } elsif (-e '/etc/debian_version') {
+     open(IN,'</etc/debian_version');
+     my $version=<IN>;
+     chomp($version);
+     close(IN);
+     if ($version =~  /^(\d+)\.\d+\.?\d*/) {
+         $dist='debian'.$1;
+     } 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;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.14
changed lines
	Added in v.1.21