added mail step4

1 files changed, 28 insertions, 26 deletions

diff --git a/transfugdrake b/transfugdrake
index 98ae074..0290140 100755
--- a/transfugdrake
+++ b/transfugdrake
@@ -19,7 +19,7 @@ use lib q(/usr/lib/libDrakX);
 use common qw(:common :system :file);
 use interactive;
 use standalone;
-use log;
+#use log;
 use my_gtk qw(:helpers :wrappers :ask);
 use netconnect;
 use detect_devices;
@@ -39,15 +39,15 @@ $::Wizard_title = _("Transfugdrake");
 $::direct = /-direct/;
 
 my $in = interactive::vnew('su');
-
-if (!(-e "/mnt/win_c")) {
+if (-e "/mnt/windows") {$win="/mnt/windows";}
+elsif (-e "/mnt/win_c") {$win="/mnt/win_c";}
+else { 
     print "no windows partitions ?\n";
-}
-if (-e "/mnt/win_c") {
-    print "windows partitions exists\n";
+    $in->ask_warn(_("No windows(c)(r)(tm) on your system!"), 
+		  _("No windows on your system. Please install windows first!"));
+    quit_global($in);
 }
 
-
 begin:
 
 #- **********************************
@@ -68,21 +68,12 @@ The next step will be bringing back windows(c)(r)(tm) files"), 1) or quit_global
 #- **********************************
 #- * 2nd step: win files
 step_2:
- print "step2\n";
 
 $wait_configuring = $in->wait_message(_("Configuring..."), 
 				      _("Configuring scripts, installing software, starting servers..."));
-
-sleep(2);
-
+#sleep(2);
 undef $wait_configuring;
  
-if (!(-e "/mnt/win_c")) {
-    $in->ask_warn(_("No windows(c)(r)(tm) on your system!"), 
-		  _("No windows on your system. Please install windows first!"));
-    quit_global($in);
-}
- 
 $::direct or $in->ask_okcancel(_("Transfug"),
 _("
 Do you want to copy all the c:\\My Documents to one of your user home ?"), 1) or quit_global($in, 0);
@@ -91,19 +82,30 @@ Do you want to copy all the c:\\My Documents to one of your user home ?"), 1) or
 #- * 3rd step: mail from win
 step_3:
 
- print "step3\n";
+mkdir "$ENV{HOME}/Mail" unless (-e "$ENV{HOME}/Mail");
 
-mkdir "~/Mail" unless (-e "~/Mail");
+$oe5onwin98="$win/WINDOWS/Application Data/Identities/{424975E0-8577-11D4-A891-989048140B20}/Microsoft/Outlook Express";
 
-if (-e "/mnt/win_c/WINDOWS/Application Data/Identities/{424975E0-8577-11D4-A891-989048140B20}/Microsoft/Outlook Express") {
-    print "OE5 on win98 detectedi\n";
-    opendir YREP, "." or die "unable to open dir: $!";
-    @files = grep !/^\.\.?$/, readdir YREP;
+if (-e $oe5onwin98) {
+    print "OE5 on win98 detected\n";
+    opendir YREP, $oe5onwin98 or die "unable to open dir: $!";
+    @files = grep /.*dbx$/, readdir YREP;
     closedir YREP;
     foreach $i (@files) {
-	`transfug_oe $i ~/Mail/$i`;
+	`transfug_oe \"$oe5onwin98/$i\" \"$ENV{HOME}/Mail/$i\"`;
     }
 } else {
-    $a=ask_file(_("Select file"));
-    `transfug_oe $i ~/Mail/$i`;
+    while (1) {
+	$a=ask_file_path(_("Select file"),"$win/") or goto step_4;
+	`transfug_oe \"$a\" \"$ENV{HOME}/Mail/$i\"`;
+    }
+    
 }
+
+#- *******************************
+#- * 4th step: mail from win
+step_4:
+$::direct or $in->ask_okcancel(_("Transfug"),
+_("You kicked windows out of your life.
+
+You no more need to reboot your system.."), 1) or quit_global($in, 0);