From 97783f172543c3b0f6c899195bb3c74fd5182b72 Mon Sep 17 00:00:00 2001
From: Daouda Lo <daouda@mandriva.com>
Date: Tue, 16 Mar 2004 20:41:41 +0000
Subject: - do not clobber files

---
 mdkapplet | 7 ++++++-
 mdkonline | 8 +-------
 mdkupdate | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mdkapplet b/mdkapplet
index 98a36596..a3ed5f9a 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -305,7 +305,12 @@ sub about {
 }
 sub setAutoStart {
     my $state = shift;
-    output_p "$ENV{HOME}/.mdkonline",
+    my $file = "$ENV{HOME}/.mdkonline";
+    if (-e $file) {
+	my %s = getVarsInSh($file);
+	
+    } 
+    output_p $file,
     qq(AUTOSTART=$state
 );
     chmod 0644, "$ENV{HOME}/.mdkonline";
diff --git a/mdkonline b/mdkonline
index 86ec9e26..bb434ae0 100755
--- a/mdkonline
+++ b/mdkonline
@@ -199,6 +199,7 @@ sub checkErrors {
 }
 sub setEntryWithConf {
     my %t = getVarsFromSh($wideconf);
+    $t{MACHINE} ||= chomp_(`hostname`);
     foreach (qw(login machine)) { $o->{$_}->get_text or $o->{$_}->set_text($t{uc($_)}) }
 }
 sub sendConfig {
@@ -411,11 +412,4 @@ MACHINE=$boxname
 COUNTRY=$country
 LASTCHECK=$d
 );
-    my $user = $ENV{INITIAL_USER} || $ENV{USER};
-    my $confpers = $user eq 'root' ? '/root/.mdkonline' : "/home/$user/.mdkonline";
-    my ($uid, $gid) = (getpwnam($user) || $user, getgrnam($user) || $user);
-    output_with_perm $confpers, 644,
-    qq(AUTOSTART=TRUE
-);
-    chown $uid, $gid, $confpers;
 }
diff --git a/mdkupdate b/mdkupdate
index 541aa133..15a954d5 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -31,7 +31,7 @@ use lib qw(/usr/lib/libDrakX);
 use common;
 BEGIN { unshift @::textdomains, 'mdkupdate' }
 
-my $in = 'interactive'->vnew('su', 'default');
+require_root_capability();
 
 my $logfile = "/var/log/mdkupdate.log";
 my $conffile = "/root/.mdkupdate";
-- 
cgit v1.2.1