loncom/build/distprobe - diff

Return to distprobe CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/distprobe between versions 1.7 and 1.20

-version 1.7, 2004/11/01 21:53:23
+version 1.20, 2011/07/21 21:28:29
  Line 42  if (-e '/etc/redhat-release') {
          } elsif ($version=~/^9/) {
              $dist='redhat9';
          }
-     } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {
+     } elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) {
- 	my $version=$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(?:| Linux) release (\d+)/) {
+         $dist = 'centos'.$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');
      }
- } 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');
      my $versionstring=<IN>;
      chomp($versionstring);
      close(IN);
-     if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /) {
+     if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
          $dist='sles'.$1;
-     } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /) {
+     } 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');
      }
+ } 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');
+         }
+     } else {
+         warn('Unable to interpret /etc/issue '.
+              'to determine system type');
+     }
+ } 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');
+     }
  } else {
      warn('Unknown installation: expecting a debian, suse, or redhat system');
  }

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

Removed from v.1.7
changed lines
	Added in v.1.20