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

version 1.5, 2003/11/24 16:56:47 version 1.14, 2007/06/28 13:30:06
Line 42  if (-e '/etc/redhat-release') { Line 42  if (-e '/etc/redhat-release') {
         } elsif ($version=~/^9/) {          } elsif ($version=~/^9/) {
             $dist='redhat9';              $dist='redhat9';
         }          }
     } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {      } elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) {
         $dist = 'fedora'.$1;   my $version=$2;
    if ($version - int($version) > .9) {
       $dist = 'fedora'.(int($version)+1);
    } else {
       $dist = 'fedora'.int($version);
    }
       } elsif ($versionstring =~ /Red Hat Enterprise Linux [AE]S release ([\d\.]+) /) {
           $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;
     } else {      } else {
         warn('Unable to interpret /etc/redhat-release '.          warn('Unable to interpret /etc/redhat-release '.
              'to determine system type');               'to determine system type');
Line 56  if (-e '/etc/redhat-release') { Line 69  if (-e '/etc/redhat-release') {
     if ($version eq '2.2') {      if ($version eq '2.2') {
  $dist='debian2.2';   $dist='debian2.2';
     }      }
   } 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');
       }
 } else {  } else {
     warn('Unknown installation: expecting a debian or redhat system');      warn('Unknown installation: expecting a debian, suse, or redhat system');
 }  }
 print $dist;  print $dist;

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


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