From 197682d0f5b9d79033b9198df57225de24fff69b Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Fri, 10 Apr 2020 11:31:51 +0300 Subject: fix mailsync script and related bar script --- dotfiles/.config/aerc/binds.conf | 2 +- dotfiles/.config/waybar/config | 2 +- dotfiles/.local/bin/mailcheck | 35 ----------------------------------- dotfiles/.local/bin/mailsync | 4 ++-- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100755 dotfiles/.local/bin/mailcheck (limited to 'dotfiles') diff --git a/dotfiles/.config/aerc/binds.conf b/dotfiles/.config/aerc/binds.conf index ee72ab5..0ef7413 100644 --- a/dotfiles/.config/aerc/binds.conf +++ b/dotfiles/.config/aerc/binds.conf @@ -6,7 +6,7 @@ = :term [messages] -q = :exec killall -42 waybar:quit +q = :exec killall -43 waybar:quit j = :next = :next diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config index 8db1eec..9b32ea2 100644 --- a/dotfiles/.config/waybar/config +++ b/dotfiles/.config/waybar/config @@ -180,7 +180,7 @@ }, "custom/mail-status": { "format": "📧 {}", - "signal": 8, + "signal": 9, "interval": "once", "exec": "barmailstatus", "tooltip": false diff --git a/dotfiles/.local/bin/mailcheck b/dotfiles/.local/bin/mailcheck deleted file mode 100755 index 75800a9..0000000 --- a/dotfiles/.local/bin/mailcheck +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Sync mail and give notification if there is new mail. - -# Run only if user logged in (prevent cron errors) -w | grep "^$USER\W" >/dev/null || exit - -# Checks for internet connection and set notification script. -ping -q -c 1 1.1.1.1 > /dev/null || exit -command -v notify-send >/dev/null || echo "Note that \`libnotify\` or \`libnotify-send\` should be installed for pop-up mail notifications with this script." - -export DISPLAY=:0.0 - -notify() { - notify-send "📬 Email" "$2 new mail(s) in \`$1\` account." - mpv $HOME/.local/share/soundalerts/mail.mp3 -} - -# Run mbsync. You can feed this script different settings. -if [ $# -eq 0 ]; then - mbsync -a -else - mbsync "$@" -fi - -# Check all accounts/mailboxes for new mail. Notify if there is new content. -for account in "$HOME/.local/share/mail/"* -do - acc="$(echo "$account" | sed "s/.*\///")" - newcount=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "$HOME/.config/mutt/.mailsynclastrun" 2> /dev/null | wc -l) - [ "$newcount" -gt "0" ] && notify "$acc" "$newcount" & -done -notmuch new 2>/dev/null - -#Create a touch file that indicates the time of the last run of mailsync -touch "$HOME/.config/mutt/.mailsynclastrun" diff --git a/dotfiles/.local/bin/mailsync b/dotfiles/.local/bin/mailsync index 9da6270..2a5ed03 100755 --- a/dotfiles/.local/bin/mailsync +++ b/dotfiles/.local/bin/mailsync @@ -6,7 +6,7 @@ w | grep "^$USER\W" >/dev/null || exit # Check several times before giving up, useful when just waking up from sleep # since internet is usually not available right away -wget -q --tries=5 --timeout=20 --spider 1.1.1.1 > /dev/null || exit +wget -q --tries=3 --timeout=20 --spider 1.1.1.1 > /dev/null || exit # Source the needed env variables so that it can function properly from cron . ~/.cache/sessionenv @@ -33,7 +33,7 @@ done if [ $thereis = 1 ]; then mpv "$HOME/.local/share/soundalerts/mail.mp3" > /dev/null - killall -42 waybar + killall -43 waybar fi notmuch new 2>/dev/null -- cgit v1.2.3