Compare commits
4 Commits
dcd2e1cd19
...
1dab2c159a
| Author | SHA1 | Date | |
|---|---|---|---|
| 1dab2c159a | |||
| 9cabb1053d | |||
| caa2f2d59c | |||
| 6a23042b74 |
@@ -31,7 +31,7 @@ define uninstall_module_rule =
|
|||||||
.PHONY: uninstall_$(module)
|
.PHONY: uninstall_$(module)
|
||||||
uninstall_$(module): uninstall_openrc_$(module) uninstall_dyndns_$(module)
|
uninstall_$(module): uninstall_openrc_$(module) uninstall_dyndns_$(module)
|
||||||
$(if $(install_submake_file),\
|
$(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
|
endef
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ endef
|
|||||||
define uninstall_nginx_module_rule =
|
define uninstall_nginx_module_rule =
|
||||||
.PHONY: uninstall_nginx_$(module)
|
.PHONY: uninstall_nginx_$(module)
|
||||||
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
|
endef
|
||||||
|
|
||||||
define remove_nginx_site_rule =
|
define remove_nginx_site_rule =
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ uninstall_openrc_$(module):
|
|||||||
$(if $(is_openrc_module),\
|
$(if $(is_openrc_module),\
|
||||||
rc-service -U joeac.net.$(module) stop; \
|
rc-service -U joeac.net.$(module) stop; \
|
||||||
rc-update -U del joeac.net.$(module) default; \
|
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
|
endef
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
capitalise = $(shell _v="$(1)"; echo $${_v^^})
|
capitalise = $(shell echo "$(1)" | tr '[:lower:]' '[:upper:]')
|
||||||
|
|
||||||
USER := $(shell whoami)
|
USER := $(shell whoami)
|
||||||
HOSTNAME := $(shell cat /etc/hostname)
|
HOSTNAME := $(shell cat /etc/hostname)
|
||||||
|
|||||||
Reference in New Issue
Block a user