mutt-wizard

commit 480fc82f9b7f222c5fdf5da43e22a1518899aa8f
parent 32d63b12dbda5fc2590176e1a99c7376e0395dc3
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Fri, 29 Apr 2022 14:49:11 -0400

openfile moved to lib, not for sole running

Diffstat:
M
Makefile
 | 
10
+++++++---
M
share/mailcap
 | 
6
+++---

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -10,8 +10,10 @@ endif
 
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/mutt-wizard
 	cp -f bin/mw bin/mailsync bin/openfile $(DESTDIR)$(PREFIX)/bin/
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/mw $(DESTDIR)$(PREFIX)/bin/mailsync $(DESTDIR)$(PREFIX)/bin/openfile
+	cp -f bin/openfile $(DESTDIR)$(PREFIX)/lib/mutt-wizard
+	chmod 755 $(DESTDIR)$(PREFIX)/bin/mw $(DESTDIR)$(PREFIX)/bin/mailsync $(DESTDIR)$(PREFIX)/lib/mutt-wizard/openfile
 	mkdir -p $(DESTDIR)$(PREFIX)/share/mutt-wizard
 	chmod 755 $(DESTDIR)$(PREFIX)/share/mutt-wizard
 	cp -f share/mailcap share/domains.csv share/mutt-wizard.muttrc share/switch.muttrc $(DESTDIR)$(PREFIX)/share/mutt-wizard
@@ -26,11 +28,13 @@ install:
 		rm -f $(DESTDIR)$(PREFIX)/bin/mwba; \
 		sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(MANPREFIX)/man1/mw.1; \
 		rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1ba; \
+		sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/mutt-wizard/mailcap; \
+		rm -f $(DESTDIR)$(PREFIX)/share/mutt-wizard/mailcapba; \
 	fi
 
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/mw $(DESTDIR)$(PREFIX)/bin/mailsync $(DESTDIR)$(PREFIX)/bin/openfile
-	rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard
+	rm -f $(DESTDIR)$(PREFIX)/bin/mw $(DESTDIR)$(PREFIX)/bin/mailsync $(DESTDIR)$(PREFIX)/lib/mutt-wizard/openfile
+	rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard  $(DESTDIR)$(PREFIX)/lib/mutt-wizard
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1
 
 .PHONY: install uninstall
diff --git a/share/mailcap b/share/mailcap
@@ -1,9 +1,9 @@
 text/plain; $EDITOR %s ;
-text/html; openfile %s ; nametemplate=%s.html
+text/html; /usr/local/lib/mutt-wizard/openfile %s ; nametemplate=%s.html
 text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump -width=1024 %s; nametemplate=%s.html; copiousoutput;
-image/*; openfile %s ;
+image/*; /usr/local/lib/mutt-wizard/openfile %s ;
 video/*; setsid mpv --quiet %s &; copiousoutput
 audio/*; mpv %s ;
-application/pdf; openfile %s ;
+application/pdf; /usr/local/lib/mutt-wizard/openfile %s ;
 application/pgp-encrypted; gpg -d '%s'; copiousoutput;
 application/pgp-keys; gpg --import '%s'; copiousoutput;