diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-03 10:28:22 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-03 10:28:22 +0100 |
| commit | b19ae63cebfb1bbca5a3834d22001c1d1d586673 (patch) | |
| tree | c3359ff64822db90459ecebf8169db3b6b2ccb92 /make | |
| parent | 17c7e2446cfc5b02df4cc437a84d13e9e05b8132 (diff) | |
| parent | 1dab2c159a62e48d9b3263bb40ddc781ebb4e891 (diff) | |
Merge branch 'main' of https://git.joeac.net/joeac/joeac.net
Diffstat (limited to 'make')
| -rw-r--r-- | make/nginx.mk | 2 | ||||
| -rw-r--r-- | make/openrc.mk | 2 | ||||
| -rw-r--r-- | make/vars.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/make/nginx.mk b/make/nginx.mk index b8b558a..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 = diff --git a/make/openrc.mk b/make/openrc.mk index 85bdc3e..92a527c 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 diff --git a/make/vars.mk b/make/vars.mk index e9f1ec4..27044cf 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) |