jaromail

a commandline tool to easily and privately handle your e-mail
git clone git://parazyd.org/jaromail.git
Log | Files | Refs | Submodules | README

commit 1ff2d3cd917040a4de7ba41c05172ad6f86e50fe
parent 5fd94916ddb2f9e9f4a55d616c36b9891b907143
Author: Jaromil <jaromil@dyne.org>
Date:   Tue, 10 Jan 2017 15:39:33 +0100

some minor fixes

Diffstat:
MChangeLog.md | 3---
MREADME.md | 2+-
Msrc/jaro | 2+-
Msrc/zlibs/imap | 14++++++++++++--
Msrc/zlibs/maildirs | 2+-
5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md @@ -27,9 +27,6 @@ groups and addressbooks. New fetures include: revamped terminal statistics, improved abook conversion, improved secure protocol checks and locking mechanisms. - - - ## 3.2 25 Jan 2015 New ZSh completion extension, now capable of tab-completion for diff --git a/README.md b/README.md @@ -78,7 +78,7 @@ environmental variable can be changed to point to where all emails will be stored, by default it is `$HOME/Mail`. The dependencies to be installed on the system for Jaro Mail are -* build: `make gcc libglib2.0-dev libgnome-keyring-dev` +* build: `make gcc libglib2.0-dev libgnome-keyring-dev libxapian-dev libgmime-2.6-dev libtalloc-dev zlib1g-dev libgpgme11-dev` * run: `fetchmail msmtp mutt notmuch pinentry-curses abook wipe alot` Keep in mind **you need to read the Manual**: this software is not diff --git a/src/jaro b/src/jaro @@ -675,7 +675,7 @@ main() { ;; remember) - cat | deliver remember + deliver remember exitcode=$? ;; diff --git a/src/zlibs/imap b/src/zlibs/imap @@ -21,37 +21,45 @@ # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. run_imap_query() { - fn run_imap_query + fn run_imap_query $* + _trans=${transport:-plain} case $_trans in SSL*) _trans=ssl ;; TLS*) _trans=tls ;; esac + if [ "$_trans" = "plain" ]; then func "running plain imap query via netcat, no encryption" nc ${imap} ${imap_port} -q 10 2>&1 + elif [ "$_trans" = "tls" ]; then func "running tls imap query via openssl, encrypted" openssl s_client -crlf -quiet -connect ${imap}:${imap_port} 2>&1 + elif [ "$_trans" = "ssl" ]; then func "running ssl imap query via openssl, encrypted" openssl s_client -starttls imap -quiet -connect ${imap}:${imap_port} 2>&1 + else error "unknown transport \"$_trans\" for a imap query" fi } check_imap() { + fn check_imap $* + [[ $name == "" ]] && { error "get_imap_info() called with no account loaded" return 1 } + [[ "$imap" == "" ]] && { error "get_imap_info() called on a non-imap account: $name on $imap" return 1 } } imap_list_folders() { - func "imap_list_folders()" + fn imap_list_folders $* check_imap && return 1 query="B00000 CAPABILITY @@ -65,6 +73,8 @@ B00003 LOGOUT" } imap_get_size() { + fn imap_get_size $* + check_imap && return 1 # skip getting size if Gmail diff --git a/src/zlibs/maildirs b/src/zlibs/maildirs @@ -320,7 +320,7 @@ deliver() { # [[ "$dest" = "outbox" ]] \ # || [[ "$dest" =~ "^zz." ]] \ # || [[ "$dest" = "incoming" ]] && { - base="`hostname`_jaro_`date +%Y-%m-%d_%H-%M-%S`_$RANDOM" + base="${HOST}_jaro_`date +%Y-%m-%d_%H-%M-%S`_$RANDOM" last_deliver="$MAILDIRS/$dest/new/$base" cat > "$last_deliver" [[ $? = 0 ]] || {