- handle mnf cases

2 files changed, 13 insertions, 6 deletions

diff --git a/mdkonline.pm b/mdkonline.pm
index ac235e4c..994aaee5 100644
--- a/mdkonline.pm
+++ b/mdkonline.pm
@@ -13,13 +13,21 @@ use HTTP::Request::Common;
 use HTTP::Request;
 
 #Don't change version manually
-$::VERSION = '1.1-13mdk';
+$::VERSION = '1.1-20mdk';
+
+my $release_file = find { -f $_ } '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
 
 sub get_release() {
-    my ($release) = cat_('/etc/mandrake-release') =~ /release\s+(\S+)/;
+    my ($release) = cat_($release_file) =~ /release\s+(\S+)/;
     ($release)
 }
 
+sub get_distro_type() {
+    my $d;
+    cat_($release_file) =~ /(corporate|mnf)/i, and $d = $1;
+    $d
+}
+
 sub get_from_URL {
     my ($link, $agent_name) = @_;
     my $ua = LWP::UserAgent->new;
@@ -133,10 +141,9 @@ sub header { "
 * $_[0]
 ********************************************************************************";
 }
-my $releasefile = find { -f $_ } '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
 output($file, map { chomp; "$_\n" }
   header("rpm -qa"), join('', sort `rpm -qa`),
-  header("mandrake version"), cat_($releasefile));
+  header("mandrake version"), cat_($release_file));
 system("/usr/bin/bzip2 -f $file");
 open(my $F, $file . ".bz2") or die "Cannot open file : $!";
 my ($chunk, $buffer);
diff --git a/mdkupdate b/mdkupdate
index 452f997a..88b1b741 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -161,8 +161,8 @@ sub update_conf {
 sub add_media {
     my $mirror = shift;
     my ($r) = mdkonline::get_release();
-    my $corporate = 1 if cat_("/etc/mandrake-release") =~ /corporate/i;
-    my $fullpath2mir = "ftp://" . $mirror . if_($corporate == 1, "/corporate") ."/$r" . "/RPMS" . "/";
+    my $dist_type = mdkonline::get_disro_type();
+    my $fullpath2mir = "ftp://" . $mirror . if_($dist_type, "/$dist_type") ."/$r" . "/RPMS" . "/";
     eval {
 	system "/usr/sbin/urpmi.removemedia", "mdkupdate";
 	system "/usr/sbin/urpmi.addmedia", "--update", "mdkupdate", $fullpath2mir, "with", "../base/synthesis.hdlist.cz";