2005-02-17 [colin] 1.0.1cvs11.5

[claws.git] / tools / filter_conv.pl

diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl
index 5ba7ba96d5ea274f3d49282f292323b89f24d978..da8ce3f219549faad03c7acfba7dce5013f33c7a 100644 (file)
--- a/tools/filter_conv.pl
+++ b/tools/filter_conv.pl
@@ -20,7 +20,12 @@ use strict;
 #  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  *
 
-chdir($ENV{ HOME } . "/.sylpheed") or die("You don't appear to have Sylpheed installed\n");
+my $old_config_dir = "$ENV{HOME}/.sylpheed";
+my $config_dir = `sylpheed --config-dir`;
+chomp $config_dir;
+
+chdir($ENV{ HOME } . "/$config_dir")
+       or die("You don't appear to have Sylpheed-Claws installed\n");
 
 ###############################################################################
 
@@ -32,7 +37,8 @@ my @new_filters = ("[global]\n");
 
 my $mailbox;
 
-open(FOLDERLIST, "<folderlist.xml") or die("Can't find 'folderlist.xml'\n");
+open(FOLDERLIST, "<$old_config_dir/folderlist.xml")
+       or die("Can't find '$old_config_dir/folderlist.xml'\n");
   while (<FOLDERLIST>) {
     if (m/<folder type="mh" name="([^"]+)" path="[^"]+"/) {
       $mailbox = $1;
@@ -43,7 +49,8 @@ close FOLDERLIST;
 
 ###############################################################################
 
-open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc')\n");
+open(FILTERRC, "<$old_config_dir/filterrc")
+       or die("Can't find your old filter rules ('$old_config_dir/filterrc')\n");
   while (<FILTERRC>) {
     chomp();
 
@@ -57,6 +64,8 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
         $mode_two,
         $action) = split(/\t/);
 
+    $value_one =~ s/\"/\\\"/g ;
+    $value_two =~ s/\"/\\\"/g ;
     $action = $action eq "m" ? "move" : "delete";
     $destination = $destination =~ m!^\#mh/! ?
                      $destination :
@@ -153,9 +162,11 @@ open(MATCHERRC, ">>matcherrc");
   print MATCHERRC @new_filters;
 close(MATCHERRC);
 
-rename("filterrc", "filterrc.old");
+print "Converted $#new_filters filters\n";
 
+if ($old_config_dir eq $config_dir) {
+       rename("filterrc", "filterrc.old");
+       print "Renamed your old filter rules ('filterrc' to 'filterrc.old')\n";
+}
 ###############################################################################
 
-print "Converted $#new_filters filters\n";
-print "Renamed your old filter rules ('filterrc' to 'filterrc.old')\n";