commit 17b880131630de5686e126d528b80832843b7edc
parent 4abc05bfb55b012e5d4082423b0565b59f85a05c
Author: Luke Smith <luke@lukesmith.xyz>
Date: Fri, 16 Mar 2018 12:14:51 -0700
Merge branch 'master' of github.com:LukeSmithxyz/mutt-wizard
Diffstat:
7 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ Note also that Gmail and some providers require you to enable sign-ins from thir
## Installation and Dependencies
+> **MacOS prerequisites** - Install `iproute2mac` and `mpv` ( brew install iproute2mac mpv )
+
`dialog`, `neomutt` and `offlineimap` should be installed. You also need to have a GPG public/private key pair for the wizard to automatically store your passwords. The whole repo should be cloned to `~/.config/mutt/`. (If you have a previous mutt folder, you'll want to back it up or delete it first.)
```
diff --git a/autoconf/offlineimap_header.macos b/autoconf/offlineimap_header.macos
@@ -0,0 +1,6 @@
+[general]
+accounts =
+starttls = yes
+ssl = true
+pythonfile = ~/.config/mutt/credentials/imappwd.py
+
diff --git a/autoconf/offlineimap_profile b/autoconf/offlineimap_profile
@@ -7,7 +7,6 @@ remoterepository = $title-remote
auth_mechanisms = LOGIN
type = $type
remoteuser = $login
-sslcacerfile = /etc/ssl/cets/ca-certificates.crt
remotepasseval = mailpasswd("$title")
remotehost = $imap
remoteport = $iport
diff --git a/autoconf/offlineimap_profile.macos b/autoconf/offlineimap_profile.macos
@@ -0,0 +1,19 @@
+[Account $title]
+
+localrepository = $title-local
+remoterepository = $title-remote
+
+[Repository $title-remote]
+auth_mechanisms = LOGIN
+type = $type
+remoteuser = $login
+sslcacertfile = /usr/local/etc/openssl/cert.pem
+remotepasseval = mailpasswd("$title")
+remotehost = $imap
+remoteport = $iport
+folderfilter = lambda foldername: foldername not in ['[Gmail]/All Mail']
+sslcacertfile = /usr/local/etc/openssl/cert.pem
+
+[Repository $title-local]
+type = Maildir
+localfolders = ~/.mail/$title
diff --git a/etc/mailsync.sh b/etc/mailsync.sh
@@ -7,8 +7,13 @@
#
# I have this run as a cronjob every 5 minutes.
-# Check for internet connection. Exit script if none.
-ping -q -w 1 -c 1 `ip r | grep default | cut -d ' ' -f 3` >/dev/null || exit
+# Check for internet connection. Exit script if none. (timeout in mac is `-t`)
+if [ "$(uname)" == "Darwin" ]
+then
+ ping -q -t 1 -c 1 `ip r | grep default | cut -d ' ' -f 3` >/dev/null || exit
+else
+ ping -q -w 1 -c 1 `ip r | grep default | cut -d ' ' -f 3` >/dev/null || exit
+fi
# Get current number of new mail, then begin sync.
ori=$(find ~/.mail -wholename '*/new/*' | grep -vi "spam\|trash\|junk" | wc -l)
diff --git a/mutt-wizard.sh b/mutt-wizard.sh
@@ -1,5 +1,12 @@
#!/bin/bash
+if [[ "$(uname)" == "Darwin" ]]
+then
+ os=".macos"
+else
+ os=""
+fi
+
muttdir="$HOME/.config/mutt/"
createMailboxes() { rm -f "$muttdir"autoconf/log
@@ -179,8 +186,8 @@ addAccount() {
mkdir -p "$muttdir"accounts/$title/cache/bodies
# Creating the offlineimaprc if it doesn't exist already.
- if [ ! -f ~/.offlineimaprc ]; then cp "$muttdir"autoconf/offlineimap_header ~/.offlineimaprc; fi
- cat "$muttdir"autoconf/offlineimap_profile | sed -e "$replacement" >> ~/.offlineimaprc
+ if [ ! -f ~/.offlineimaprc ]; then cp "$muttdir"autoconf/offlineimap_header"$os" ~/.offlineimaprc; fi
+ cat "$muttdir"autoconf/offlineimap_profile"$os" | sed -e "$replacement" >> ~/.offlineimaprc
mkdir -p ~/.mail/$title
# Add the mutt profile.
@@ -189,7 +196,7 @@ addAccount() {
echo "macro index,pager i$idnum '<sync-mailbox><enter-command>source "$muttdir"accounts/$title.muttrc<enter><change-folder>!<enter>'" >> "$muttdir"personal.muttrc
# Add to offlineimaprc sync list.
- sed -i "s/^accounts =.*[a-zA-Z]$/&, $title/g;s/^accounts =\s*$/accounts = $title/g" ~/.offlineimaprc
+ sed -i.bu "s/^accounts =.*[a-zA-Z]$/&, $title/g;s/^accounts =\s*$/accounts = $title/g" ~/.offlineimaprc && rm ~/.offlineimaprc.bu
# Makes account default if there is no default account.
grep "$muttdir"personal.muttrc -e "^source .*accounts.*" >/dev/null && echo there || \
diff --git a/muttrc b/muttrc
@@ -7,7 +7,7 @@ source etc/muttcol
source etc/aliases
set sleep_time = 0
set sort = 'reverse-date'
-set editor = vim
+set editor = $EDITOR
#set copy = no
set timeout = "5"
set mail_check = "10"
