--- loncom/build/distprobe 2007/04/22 16:33:22 1.11 +++ loncom/build/distprobe 2007/05/31 13:36:53 1.13 @@ -2,7 +2,7 @@ # # The LearningOnline Network with CAPA # -# $Id: distprobe,v 1.11 2007/04/22 16:33:22 raeburn Exp $ +# $Id: distprobe,v 1.13 2007/05/31 13:36:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,8 +42,8 @@ if (-e '/etc/redhat-release') { } elsif ($version=~/^9/) { $dist='redhat9'; } - } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) { - my $version=$1; + } elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) { + my $version=$2; if ($version - int($version) > .9) { $dist = 'fedora'.(int($version)+1); } else { @@ -51,6 +51,8 @@ if (-e '/etc/redhat-release') { } } 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; } else { warn('Unable to interpret /etc/redhat-release '. 'to determine system type');