--- loncom/build/distprobe 2009/06/28 14:22:04 1.15 +++ loncom/build/distprobe 2009/07/05 23:58:38 1.16 @@ -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.16 2009/07/05 23:58:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,6 +61,21 @@ if (-e '/etc/redhat-release') { warn('Unable to interpret /etc/redhat-release '. 'to determine system type'); } +} elsif (-e '/etc/SuSE-release') { + open(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'); + } } elsif (-e '/etc/issue') { open(IN,'; @@ -96,21 +111,6 @@ if (-e '/etc/redhat-release') { warn('Unable to interpret /etc/debian_version '. 'to determine system type'); } -} elsif (-e '/etc/SuSE-release') { - open(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 { warn('Unknown installation: expecting a debian, suse, or redhat system'); }