mbsync: rename deprecated isync to mbsync

Also provide a make target for it and one for install all mail related
things.

diff --git a/Makefile b/Makefile
index b214a5e21c6243eb6eb76dd43dae1f4751afea24..71ed29c8c8f791b79d997cda6b947f1d2071863c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,10 @@ mpd: systemd
        systemctl --user start mpd
 .PHONY: mpd
 
        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
 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
 
        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
 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 89a199496f272714867133619171923676a7eedd..e92c65bf17bb5eaec79bb452e33735f9bb5008f1 100644 (file)
--- 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
 [Service]
 Type=oneshot
 TimeoutStartSec=4min

-ExecStart=%h/.config/isync/sync-mail %i
+ExecStart=%h/.config/mbsync/sync-mail %i