From 6a23042b7452b64f2e141ce9964247d813620b97 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Fri, 3 Jul 2026 09:20:19 +0100 Subject: [PATCH 1/4] makes capitalise func POSIX-compatible --- make/nginx.mk | 2 +- make/vars.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/nginx.mk b/make/nginx.mk index b8b558a..16510a6 100644 --- a/make/nginx.mk +++ b/make/nginx.mk @@ -23,7 +23,7 @@ endef define uninstall_nginx_module_rule = .PHONY: uninstall_nginx_$(module) uninstall_nginx_$(module): - (if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) + $(if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) endef define remove_nginx_site_rule = diff --git a/make/vars.mk b/make/vars.mk index 2033a06..6ab3af4 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -1,4 +1,4 @@ -capitalise = $(shell _v="$(1)"; echo $${_v^^}) +capitalise = $(shell echo "$(1)" | tr '[:lower:]' '[:upper:]') USER := $(shell whoami) HOSTNAME := $(shell cat /etc/hostname) From caa2f2d59ce1648fda0adf56886ec8598b98e7df Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Fri, 3 Jul 2026 09:23:40 +0100 Subject: [PATCH 2/4] adds needed sudo to nginx module uninstall --- make/nginx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/nginx.mk b/make/nginx.mk index 16510a6..4e49600 100644 --- a/make/nginx.mk +++ b/make/nginx.mk @@ -23,7 +23,7 @@ endef define uninstall_nginx_module_rule = .PHONY: uninstall_nginx_$(module) uninstall_nginx_$(module): - $(if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) + $(if $(SUBDOMAIN_$(module)),sudo rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) endef define remove_nginx_site_rule = From 9cabb1053d90aa21bb1cdceb18a63a904f3aea0d Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Fri, 3 Jul 2026 09:24:26 +0100 Subject: [PATCH 3/4] adds missing dollar in uninstall_module --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 974b72a..8da5087 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ define uninstall_module_rule = .PHONY: uninstall_$(module) uninstall_$(module): uninstall_openrc_$(module) uninstall_dyndns_$(module) $(if $(install_submake_file),\ - $(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall + $(MAKE) --makefile=$(notdir $(install_submake_file)) --directory $(dir $(install_submake_file)) uninstall ) endef From 1dab2c159a62e48d9b3263bb40ddc781ebb4e891 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Fri, 3 Jul 2026 10:17:01 +0100 Subject: [PATCH 4/4] uninstalling module openrc file uses -f flag to avoid errors --- make/openrc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/openrc.mk b/make/openrc.mk index 7ca71fe..4efc89c 100644 --- a/make/openrc.mk +++ b/make/openrc.mk @@ -21,7 +21,7 @@ uninstall_openrc_$(module): $(if $(is_openrc_module),\ rc-service -U joeac.net.$(module) stop; \ rc-update -U del joeac.net.$(module) default; \ - rm ~/.config/rc/init.d/joeac.net.$(module); \ + rm -f ~/.config/rc/init.d/joeac.net.$(module); \ ) endef