jaromail

commit 77291e26898d90760506e579751292303cbe1a5a
parent 094315f11e2bf04a70a81b0e06bec6b427631f50
Author: Jaromil <jaromil@dyne.org>
Date:   Tue, 28 Aug 2012 15:12:44 +0200

backup also in existing maildirs, better code syntax

Diffstat:
M
src/zlibs/email
 | 
6
+++---
M
src/zlibs/helpers
 | 
3
+--
M
src/zlibs/maildirs
 | 
16
++++++----------
M
src/zlibs/search
 | 
10
+++++-----

4 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/src/zlibs/email b/src/zlibs/email
@@ -113,7 +113,7 @@ fetch() {
     # get_imap_info
 
     # return here if the imap folders are all empty
-    # { test ${imap_info[${#imap_info}]} = 0 } && { 
+    # { test ${imap_info[${#imap_info}]} = 0 } && {
     # 	act "Mailbox is empty, nothing to fetch."
     # 	return 0 }
 
@@ -333,7 +333,7 @@ later() {
     filename=$USER.${hostname}.$datestamp.$RANDOM
     # hostname was set by the main jaro routine
     func "Filename: $filename"
-    maildircheck ${MAILDIRS}/remember
-    { test $? = 0 } || { maildirmake ${MAILDIRS}/remember }
+
+    { maildircheck ${MAILDIRS}/remember } || { maildirmake ${MAILDIRS}/remember }
     cat > ${MAILDIRS}/remember/new/$filename
 }
diff --git a/src/zlibs/helpers b/src/zlibs/helpers
@@ -50,8 +50,7 @@ autostart() {
     # or a directory of file
     { test -r "$1" } && {
 	# is it a maildir? then open
-	maildircheck ${1}
-	{ test $? = 0 } && {
+	{ maildircheck ${1} } && {
 	    mutt -F $MUTTDIR/rc ${=muttflags} -f ${1}
 	    return 0 }
 	# is it a regular file? then attach it
diff --git a/src/zlibs/maildirs b/src/zlibs/maildirs
@@ -66,8 +66,8 @@ list_maildirs() {
     /new$/ {next}
     /\/jaro\// {next}
     {print $0}'`; do
-	maildircheck $m
-	{ test $? = 0 } && {
+	
+	{ maildircheck $m } && {
 	    # is a maildir
 	    { test "`find $m -type f`" != "" } && {
 		# and is not empty
@@ -87,8 +87,7 @@ rmdupes() {
 	    error "Directory not found: $folder"
 	    continue }
 
-	maildircheck ${folder}
-	{ test $? = 0 } || {
+	{ maildircheck ${folder} } || {
 	    error "Not a maildir folder: $folder"
 	    continue }
 
@@ -117,13 +116,11 @@ merge() {
 	error "Cannot merge same directory in itself: $src = $dst"
 	return 1 }
 
-    maildircheck $src
-    { test $? = 0 } || {
+    { maildircheck $src } || {
 	error "Source is not a maildir: $src"
 	return 1 }
 
-    maildircheck $dst
-    { test $? = 0 } || {
+    { maildircheck $dst } || {
 	error "Destination is not a maildir: $dst"
 	return 1 }
 
@@ -188,8 +185,7 @@ filter() {
 	    error "Directory not found: $folder"
 	    continue }
 	
-	maildircheck ${folder}
-	{ test $? = 0 } || {
+	{ maildircheck ${folder} } || {
 	    error "Not a maildir folder: $folder"
 	    continue }
 
diff --git a/src/zlibs/search b/src/zlibs/search
@@ -219,11 +219,11 @@ backup() {
     }
 
     dst=${fold[${#fold}]}
-    { test -r "$dst" } && {
-	error "Backup destination already exists: $dst"
-	return 1 }
-
-    maildirmake "${dst}"
+    if [ -r "$dst" ]; then
+	act "Backup destination already exists: $dst"
+    else
+	maildirmake "${dst}"
+    fi
 
     { test ${#expr} = 0 } && {
 	error "No expression set for backup, please indicate what you want to backup"