commit c4ae9735a0eff00dd0f5849e066621bfd4245d56
parent 5b11ebf621c8000422cfd935a35333cf25a109c4
Author: Jaromil <jaromil@dyne.org>
Date: Tue, 29 May 2012 20:48:49 +0200
documentation and cosmetics
Diffstat:
| A | ChangeLog | | | 8 | ++++++++ |
| M | TODO | | | 14 | +++++++------- |
| M | install.sh | | | 50 | +++++++++++++++++++++++++++++--------------------- |
| M | src/jaro | | | 40 | ++++++++++++++++++---------------------- |
4 files changed, 62 insertions(+), 50 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,8 @@
+
+Jaro Mail 0.1 - 29 May 2012 - Initial release
+ After a dozen years of development and use,
+ Jaromil releases his own e-mail and mailinglist
+ desktop setup.
+ While doing so, J. asked his friend and colleague
+ Max Kazemzadeh how he should call it, and Max replied:
+ Jaromail!
diff --git a/TODO b/TODO
@@ -1,12 +1,12 @@
-* Maildirs
- + Remove duplicates from maildirs (garbage collection)
- + Backup system with expiration date
-
* GTD
+ Integration with org-remember via org-protocol
+* Anonymizer
+ + Built-in support for Mixmaster
+ + Built-in support for Tor Mail
+
* Install
+ Full integration with the Tomb process creation
@@ -16,6 +16,6 @@
* Stats
+ Have some fancy statistics
-* Anonymizer
- + Built-in support for Mixmaster
- + Built-in support for Tor Mail
+* DONE Maildirs
+ + Remove duplicates from maildirs (garbage collection)
+ + Backup system with expiration date
diff --git a/install.sh b/install.sh
@@ -57,22 +57,23 @@ if ! [ -r $WORKDIR/Filters.txt ]; then
# mailinglist filters are in order of importance
# syntax: to <list email> save <folder>
-
-to crypto@lists.dyne save dyne.crypto
-to dynebolic save dyne.dynebolic
-to freej save dyne.freej
-to frei0r-devel save dyne.frei0r
-to taccuino save ml.freaknet
-to deadpoets save ml.freaknet
-to linux-libre save gnu.linux-libre
-to foundations@lists save gnu.foundations
-to debian-mentors save debian.mentors
-to debian-blends save debian.blends
-to freedombox-discuss save debian.freedombox
-
-# other filters for web 2.0 services
-# using folder names with a prefix. can facilitate
-# folder maintainance.
+# below some commented out examples, note the use of a prefix,
+# which makes it handy when browsing with file completion.
+
+# to crypto@lists.dyne save dyne.crypto
+# to dynebolic save dyne.dynebolic
+# to freej save dyne.freej
+# to frei0r-devel save dyne.frei0r
+# to taccuino save ml.freaknet
+# to deadpoets save ml.freaknet
+# to linux-libre save gnu.linux-libre
+# to foundations@lists save gnu.foundations
+# to debian-mentors save debian.mentors
+# to debian-blends save debian.blends
+# to freedombox-discuss save debian.freedombox
+
+# Other filters for web 2.0 using folder names with a prefix:
+# they can facilitate folder maintainance.
from identi.ca save web.identica
from Twitter save web.twitter
@@ -163,7 +164,13 @@ port 993
# by default this is 'keep': don't delete mails from server
options keep
-# the password field will be filled in automatically
+# Imap folders
+# uncommend to provide a list of folders to be fetched
+# folders INBOX, known, priv, lists, ml.unsorted, unsorted
+
+#
+# The password field will be filled in automatically
+#
EOF
cat <<EOF > $WORKDIR/Accounts/smtp.default.txt
# Name and values are separated by spaces or tabs
@@ -182,8 +189,8 @@ login USERNAME@gmail.com
transport ssl # or "tls" or "plain"
# Service port
-port 465
-# port 25
+# port 465
+port 25
EOF
act "Default accounts directory created"
else
@@ -277,8 +284,9 @@ EOF
esac
notice "Installation completed" #, now edit your personal settings:"
-act "Now edit your personal settings, accounts and filters in:"
-act "$WORKDIR"
+act "Configure your personal settings, accounts and filters in:"
+act " $WORKDIR"
+act "Check the commandline help for a list of commands: jaro -h"
# OS specific post install rules
case $OS in
diff --git a/src/jaro b/src/jaro
@@ -566,18 +566,14 @@ send() {
return 0
fi
- if [ -z $acct ]; then
- if [ -r $adir/smtp.default ]; then
- all+=($adir/smtp.default) # use the default account
- else # else will use the first one
- for a in `find $adir -name "smtp*"`; do all+=($a); done
- fi
- else # or if specified, use a particular account
- for a in `find $adir -name "smtp*$acct*"`; do all+=($a); done
+ if [ -z $1 ]; then # no particular account specified
+ # use the default account
+ read_default_account "out"
+ else
+ read_account smtp.${1}
fi
- read_account `basename ${all[1]}`
- notice "Sending out ${mailnum} mails via `basename ${all[1]}`"
+ notice "Sending out ${mailnum} mails via $name"
# defaults
[ -z $auth ] && auth=plain
@@ -939,7 +935,7 @@ Jaro Mail $VERSION - your humble and faithful electronic postman
Copyright (C) 2010-2012 Dyne.org Foundation, License GNU GPL v3+
This is free software: you are free to change and redistribute it
- The latest Tomb sourcecode is published on <http://tomb.dyne.org>
+ The latest Jaro Mail sourcecode is on <http://jaromail.dyne.org>
Syntact: jaro command [options] [account]
@@ -1075,25 +1071,25 @@ main()
if option_is_set -n; then act "Dry run, show operations without executing them."; DRYRUN=1; fi
case "$subcommand" in
- queue) queue ${PARAM} ;;
- fetch) fetch ${PARAM} ;;
- send) send ${PARAM} ;;
- peek) peek ${PARAM} ;;
- read) mutt -F $MUTTDIR/rc ;;
- cert) cert ${PARAM} ;;
+ queue) queue ${PARAM} ;;
+ fetch) fetch ${PARAM} ;;
+ send) send ${PARAM} ;;
+ peek) peek ${PARAM} ;;
+ read) mutt -F $MUTTDIR/rc ;;
+ cert) cert ${PARAM} ;;
compose) mutt -F $MUTTDIR/rc ${PARAM} ;;
- update) update ;;
+ update) update ;;
- query) query ${PARAM} ;;
- learn) learn ${PARAM} ;;
+ query) query ${PARAM} ;;
+ learn) learn ${PARAM} ;;
- backup) backup ${PARAM} ;;
+ backup) backup ${PARAM} ;;
rmdupes) rmdupes ${PARAM} ;;
merge) merge ${PARAM} ;;
'source') return 0 ;;
- __default) ;;
+ __default) ;;
*) error "command \"$subcommand\" not recognized"
act "try -h for help"
return 1
