diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/mailsync | 2 | ||||
| -rwxr-xr-x | bin/mw | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/mailsync b/bin/mailsync index 3a681f0..7114836 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -74,7 +74,7 @@ syncandnotify() { [ -z "$MAILSYNC_MUTE" ] && for file in $new; do # Extract and decode subject and sender from mail. - subject=$(awk '/^Subject: / && ++n == 1,/^.*: / && ++i == 2' "$file" | head -n-1 | + subject=$(awk '/^Subject: / && ++n == 1,/^.*: / && ++i == 2' "$file" | sed '$d' | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | sed 's/^Subject: //' | tr -d '\n\t') from="$(sed -n "/^From:/ s|From: *|| p" "$file" | @@ -34,7 +34,11 @@ alias mbsync='mbsync -c "$mbsyncrc"' # mbsync >=1.4.0 requires "Far/Near" rather than "Master/Slave." mbver="$(mbsync -v)" mbver="${mbver#* }" -if [ "${mbver%.*}" >= 1.4 ]; then +mbver="${mbver%.*}" +# Comparing two float numbers in bash is a pain in the butt, so we get rid of +# dots and turn them into nice integers +mbver="${mbver/\./}" +if [ "${mbver}" -gt 14 ]; then master="Far" slave="Near" else @@ -82,7 +86,7 @@ prepmpop() { } prepimapnotify() { - mkdir -p "${imapnotify%/*}" ; envsubst < "$imapnotifytemp" >> "$imapnotify/$fulladdr.conf" + mkdir -p "$imapnotify" ; envsubst < "$imapnotifytemp" >> "$imapnotify/$fulladdr.conf" } prepmutt() { @@ -190,7 +194,7 @@ askinfo() { } insertpass() { - printf "%s" "$password" | pass insert -fe "$PASSWORD_STORE_DIR/$passprefix$fulladdr" + printf "%s" "$password" | pass insert -fe "$passprefix$fulladdr" } errorexit() { |