From cd5fd9bde283454bb64549bb064ecd3d50500d23 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Mon, 1 Jul 2019 18:14:16 -0400 Subject: Make use of PREFIX environment variable This patch puts the environment variable PREFIX in more use. If specified, mull-wizard Makefile substitute all instances of prefix with the provided environment variable. Signed-off-by: Ayman Bagabas --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 68db4ff..c0a6a05 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,8 @@ .POSIX: OS = $(shell uname -s) -ifeq ($(OS), Darwin) +ifndef PREFIX PREFIX = /usr/local -else - PREFIX = /usr endif MANPREFIX = $(PREFIX)/share/man @@ -18,12 +16,16 @@ install: for shared in share/*; do \ cp -f $$shared $(DESTDIR)$(PREFIX)/share/mutt-wizard; \ done + mkdir -p $(DESTDIR)$(MANPREFIX)/man1 + cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 + if [ "$(PREFIX)" ]; then \ + sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrc; \ + sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/mw; \ + sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(MANPREFIX)/man1/mw.1; \ + fi if [ "$(OS)" = "Darwin" ]; then \ - sed -iba 's/\/usr\//\/usr\/local\//' $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrc; \ rm $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrcba; \ fi - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 uninstall: for script in bin/*; do \ -- cgit v1.2.3 From 04528a0fb92ea57be040a7ed87901d8186c970ff Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Mon, 1 Jul 2019 19:18:36 -0400 Subject: Fix make uninstall for loop directory wildcard includes the directory name. No need to specify the dir name when removing file. Signed-off-by: Ayman Bagabas --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c0a6a05..7c95b7f 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ install: uninstall: for script in bin/*; do \ - rm -f $(DESTDIR)$(PREFIX)/bin/$$script; \ + rm -f $(DESTDIR)$(PREFIX)/$$script; \ done rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard -- cgit v1.2.3 From 4904fcf51f878a8648d333d2fac7cbfe2728c47b Mon Sep 17 00:00:00 2001 From: Kipras Melnikovas Date: Sun, 24 Nov 2019 01:31:17 +0200 Subject: Fix script removal (#310) The `script` variable you were referring to previously is actually the relative path to a script, for example `bin/mw`. This fails to remove the script, because, obviously, the path is incorrect. I'd suggest renaming `script` to `scriptPath` in line 13 and `shared` to `sharedPath` in line 18 (or whatever variable names you prefer that make it clearer) to avoid confusion in the future. Signed-off-by: Kipras Melnikovas --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 20c82d1..823e719 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,9 @@ install: cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 uninstall: - for script in bin/*; do \ - rm -f $(DESTDIR)$(PREFIX)/bin/$$script; \ + for scriptPath in bin/*; do \ + scriptFile=$$(basename $$scriptPath); \ + rm -f $(DESTDIR)$(PREFIX)/bin/$$scriptFile; \ done rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1 -- cgit v1.2.3 From 15941b43e7cec4b66ad2e9911ca791f365aac362 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 24 Nov 2019 08:26:16 -0500 Subject: Revert "Fix script removal (#310)" This reverts commit 4904fcf51f878a8648d333d2fac7cbfe2728c47b. --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 823e719..20c82d1 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,8 @@ install: cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 uninstall: - for scriptPath in bin/*; do \ - scriptFile=$$(basename $$scriptPath); \ - rm -f $(DESTDIR)$(PREFIX)/bin/$$scriptFile; \ + for script in bin/*; do \ + rm -f $(DESTDIR)$(PREFIX)/bin/$$script; \ done rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1 -- cgit v1.2.3 From 576d7b3d65d10e13418f1c05b504065207208f41 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 25 Nov 2019 12:40:18 -0500 Subject: backup files deleted on install --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 13214f5..d66ca46 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ install: cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 if [ "$(PREFIX)" ]; then \ sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrc; \ + rm -f $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrcba; \ sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/mw; \ + rm -f $(DESTDIR)$(PREFIX)/bin/mwba; \ sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(MANPREFIX)/man1/mw.1; \ - fi - if [ "$(OS)" = "Darwin" ]; then \ - rm $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrcba; \ + rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1ba; \ fi uninstall: -- cgit v1.2.3 From ea1526dbd2e901aed18be123755a4e790023b2d0 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 25 Nov 2019 16:50:08 -0500 Subject: ensure permissions --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d66ca46..00e71e8 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,14 @@ install: chmod 755 $(DESTDIR)$(PREFIX)/$$script; \ done mkdir -p $(DESTDIR)$(PREFIX)/share/mutt-wizard + chmod 755 $(DESTDIR)$(PREFIX)/share/mutt-wizard for shared in share/*; do \ cp -f $$shared $(DESTDIR)$(PREFIX)/share/mutt-wizard; \ + chmod 644 $(DESTDIR)$(PREFIX)/share/mutt-wizard/$$shared; \ done mkdir -p $(DESTDIR)$(MANPREFIX)/man1 cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 + chmod 644 $(DESTDIR)$(MANPREFIX)/man1/mw.1 if [ "$(PREFIX)" ]; then \ sed -iba 's:/usr/local:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrc; \ rm -f $(DESTDIR)$(PREFIX)/share/mutt-wizard/mutt-wizard.muttrcba; \ -- cgit v1.2.3 From c19d305c4f9681568b79e52c43532def4356df71 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 25 Nov 2019 18:30:24 -0500 Subject: share files permission fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 00e71e8..6633b7b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ install: chmod 755 $(DESTDIR)$(PREFIX)/share/mutt-wizard for shared in share/*; do \ cp -f $$shared $(DESTDIR)$(PREFIX)/share/mutt-wizard; \ - chmod 644 $(DESTDIR)$(PREFIX)/share/mutt-wizard/$$shared; \ + chmod 644 $(DESTDIR)$(PREFIX)/share/mutt-wizard/$$(basename $(notdir $$shared)); \ done mkdir -p $(DESTDIR)$(MANPREFIX)/man1 cp -f mw.1 $(DESTDIR)$(MANPREFIX)/man1/mw.1 -- cgit v1.2.3