update location of addrbook sub-folder in address conversion scripts

diff --git a/tools/mew2claws-mail.pl b/tools/mew2claws-mail.pl
index cc43419e92d6752f4ea317dc25bc49a7becaf9f9..e626282c4aff361eabb56cb609d2ed5cbe99130f 100755 (executable)
--- a/tools/mew2claws-mail.pl
+++ b/tools/mew2claws-mail.pl
@@ -52,7 +52,7 @@ $claws_addr='';
 $home = glob("~");
 $clawsdir=`claws-mail --config-dir`;
 chomp($clawsdir);
-$clawsdir = $home . '/' . $clawsdir;
+$clawsdir = $home . '/' . $clawsdir . '/' . 'addrbook/';
 
 opendir(CLAWS, $clawsdir) || die("Can't open $clawsdir directory\n");
 push(@cached,(readdir(CLAWS)));

diff --git a/tools/outlook2claws-mail.pl b/tools/outlook2claws-mail.pl
index 67bc3ebebe6a557a5e96f79d3c9202ee52ad2812..b0d703a13b40b6f57dee5d1c34e5a3b04bd7df52 100755 (executable)
--- a/tools/outlook2claws-mail.pl
+++ b/tools/outlook2claws-mail.pl
@@ -41,7 +41,7 @@ else {
        $outl_file = $ARGV[0];
 }
 # some init
-$clawsconf = ".claws-mail";
+$clawsconf = ".claws-mail/addrbook";
 $indexname = "$clawsconf/addrbook--index.xml";
 
 # the next is mostly Paul's code
@@ -190,7 +190,7 @@ if ($do_csv) {
                unless ($#headerline == $nboffields);
 }
 open(NEWB, '>', "$clawsconf/$new_book") 
-       or die "Error: can't open $clawsconf/$new_book for writting\n";
+       or die "Error: can't open $clawsconf/$new_book for writing\n";
 if ($do_csv) { process_csv(); }
 else { process_text(); }
 
@@ -211,7 +211,7 @@ foreach $index_line (@index_file) {
        }
 }
 open (INDX, '>', $indexname)
-       or die "Error: can't open $indexname for writting\n";
+       or die "Error: can't open $indexname for writing\n";
 print INDX "$new_index";
 close INDX;
 

diff --git a/tools/tb2claws-mail b/tools/tb2claws-mail
index 5c0e55aa6f7493958f25f5912c351077d34848b8..70300610a515ae2aac11148f50f54378ccc51982 100755 (executable)
--- a/tools/tb2claws-mail
+++ b/tools/tb2claws-mail
@@ -43,7 +43,7 @@ $total_addresses = 0;
 chdir;
 
 # check is Claws-Mail instrtalled
-opendir(CLAWS, ".claws-mail") || die("Can't open Claws Mail directory! Conversion abroted\n");
+opendir(CLAWS, ".claws-mail/addrbook") || die("Can't open Claws Mail directory! Conversion aborted\n");
     push(@cached, (readdir(CLAWS)));
 closedir(CLAWS);
 
@@ -251,12 +251,12 @@ foreach $tbline (@tblines) {
 $claws_addr .= "</address-book>\n";
 
 # print new addressbook to file
-open (NEWADDR, ">.claws-mail/$new_addrbk");
+open (NEWADDR, ">.claws-mail/addrbook/$new_addrbk");
     print NEWADDR $claws_addr;
 close NEWADDR;
 
 # add new addressbook to index
-open (ADDRIN, "<.claws-mail/addrbook--index.xml") || die("Can't open addrbook--index.xml");
+open (ADDRIN, "<.claws-mail/addrbook/addrbook--index.xml") || die("Can't open addrbook--index.xml");
     @addrindex_file = <ADDRIN>;
 close ADDRIN;
 
@@ -269,7 +269,7 @@ foreach $addrindex_line (@addrindex_file) {
     }
 }
 
-open (NEWADDRIN, ">.claws-mail/addrbook--index.xml");
+open (NEWADDRIN, ">.claws-mail/addrbook/addrbook--index.xml");
     print NEWADDRIN "$rewrite_addrin";
 close NEWADDRIN;
 print "You have sucessfully converted your The Bat! addressbook\n";

diff --git a/tools/vcard2xml.py b/tools/vcard2xml.py
index ecff3d5bb672857505b448fbcc889513a5ae9527..dd6b6146b295d17660765b09af2028f8fe745533 100755 (executable)
--- a/tools/vcard2xml.py
+++ b/tools/vcard2xml.py
@@ -222,7 +222,7 @@ def execute () :
 
        in_file = None
        out_file = None
-       path_to_out = os.environ['HOME']+'/.claws-mail/'
+       path_to_out = os.environ['HOME']+'/.claws-mail/addrbook/'
        adr_idx = 'addrbook--index.xml'
        adr_idx_file = None
        tmp_adr_idx_file= None