From ce9777d2eb1dd03c5124dca2add71213b550d59f Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Fri, 18 Oct 2019 10:43:41 +0100
Subject: [PATCH] mbsync: rename deprecated isync to mbsync

Also provide a make target for it and one for install all mail related
things.
---
 Makefile                                      | 7 +++++++
 {isync => mbsync}/config                      | 0
 {isync => mbsync}/parse-mail.py               | 0
 {isync => mbsync}/post-sync.d/10-youtube.hook | 0
 {isync => mbsync}/sync-mail                   | 0
 systemd/user/mbsync@.service                  | 2 +-
 6 files changed, 8 insertions(+), 1 deletion(-)
 rename {isync => mbsync}/config (100%)
 rename {isync => mbsync}/parse-mail.py (100%)
 rename {isync => mbsync}/post-sync.d/10-youtube.hook (100%)
 rename {isync => mbsync}/sync-mail (100%)

diff --git a/Makefile b/Makefile
index b214a5e..71ed29c 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,10 @@ mpd: systemd
 	systemctl --user start mpd
 .PHONY: mpd
 
+mbsync:
+	ln -sfT $(APATH)/mbsync $(XDG_CONFIG_HOME)/mbsync
+.PHONY: mbsync
+
 msmtp:
 	ln -sfT $(APATH)/msmtprc ~/.msmtprc
 	ln -sfT $(APATH)/msmtp ~/.msmtp
@@ -59,6 +63,9 @@ mutt: $(XDG_CONFIG_HOME)
 	ln -sfT $(APATH)/mutt $(XDG_CONFIG_HOME)/mutt
 .PHONY: mutt
 
+mail: mbsync msmtp mutt
+.PHONY: mail
+
 ncmpcpp: $(XDG_CONFIG_HOME)
 	ln -sfT $(APATH)/ncmpcpp $(XDG_CONFIG_HOME)/ncmpcpp
 	mkdir -p $(XDG_DATA_HOME)/mpd/lyrics
diff --git a/isync/config b/mbsync/config
similarity index 100%
rename from isync/config
rename to mbsync/config
diff --git a/isync/parse-mail.py b/mbsync/parse-mail.py
similarity index 100%
rename from isync/parse-mail.py
rename to mbsync/parse-mail.py
diff --git a/isync/post-sync.d/10-youtube.hook b/mbsync/post-sync.d/10-youtube.hook
similarity index 100%
rename from isync/post-sync.d/10-youtube.hook
rename to mbsync/post-sync.d/10-youtube.hook
diff --git a/isync/sync-mail b/mbsync/sync-mail
similarity index 100%
rename from isync/sync-mail
rename to mbsync/sync-mail
diff --git a/systemd/user/mbsync@.service b/systemd/user/mbsync@.service
index 89a1994..e92c65b 100644
--- a/systemd/user/mbsync@.service
+++ b/systemd/user/mbsync@.service
@@ -5,4 +5,4 @@ After=network.target network-online.target dbus.socket
 [Service]
 Type=oneshot
 TimeoutStartSec=4min
-ExecStart=%h/.config/isync/sync-mail %i
+ExecStart=%h/.config/mbsync/sync-mail %i
-- 
2.48.1