joeac/joeac.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pulls out USER variable

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-03 09:02:22 +01:00
parent b705e9e1e5
commit 19865adb6a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/openrc.mk
+6 -6
View File
@@ -50,7 +50,7 @@ $(foreach module,$(MODULES),$(eval $(openrc_add_rule)))
$(foreach module,$(MODULES),$(eval $(openrc_start_rule))) $(foreach module,$(MODULES),$(eval $(openrc_start_rule)))
$(foreach module,$(MODULES),$(eval $(openrc_restart_rule))) $(foreach module,$(MODULES),$(eval $(openrc_restart_rule)))
~/.config/rc/init.d/joeac.net: openrc/init.d/joeac.net ~/.config/rc/init.d ~/.config/rc/runlevels/default /etc/init.d/user.$(shell whoami) /etc/conf.d/user.$(shell whoami) ~/.config/rc/init.d/joeac.net: openrc/init.d/joeac.net ~/.config/rc/init.d ~/.config/rc/runlevels/default /etc/init.d/user.$(USER) /etc/conf.d/user.$(USER)
rm -f ~/.config/rc/init.d/joeac.net; \ rm -f ~/.config/rc/init.d/joeac.net; \
mkdir -p ~/.config/rc/init.d; \ mkdir -p ~/.config/rc/init.d; \
cp openrc/init.d/joeac.net ~/.config/rc/init.d/joeac.net cp openrc/init.d/joeac.net ~/.config/rc/init.d/joeac.net
@@ -61,12 +61,12 @@ $(foreach module,$(MODULES),$(eval $(openrc_restart_rule)))
~/.config/rc/runlevels/default: ~/.config/rc/runlevels/default:
mkdir -p ~/.config/rc/runlevels/default mkdir -p ~/.config/rc/runlevels/default
/etc/init.d/user.$(shell whoami): /etc/init.d/user.$(USER):
sudo ln -s /etc/init.d/user /etc/init.d/user.$(shell whoami) sudo ln -s /etc/init.d/user /etc/init.d/user.$(USER)
/etc/conf.d/user.$(shell whoami): openrc/conf.d/user.$(shell whoami) /etc/conf.d/user.$(USER): openrc/conf.d/user.$(USER)
sudo cp openrc/conf.d/user.$(shell whoami) /etc/conf.d/user.$(shell whoami) sudo cp openrc/conf.d/user.$(USER) /etc/conf.d/user.$(USER)
sudo rc-update add user.$(shell whoami) default sudo rc-update add user.$(USER) default
.PHONY: uninstall_joeac.net_service .PHONY: uninstall_joeac.net_service
rm ~/.config/rc/joeac.net rm ~/.config/rc/joeac.net
make/vars.mk
+1
View File
@@ -1,5 +1,6 @@
capitalise = $(shell _v="$(1)"; echo $${_v^^}) capitalise = $(shell _v="$(1)"; echo $${_v^^})
USER := $(shell whoami)
HOSTNAME := $(shell cat /etc/hostname) HOSTNAME := $(shell cat /etc/hostname)
HOSTNAMES := pi-broughton blade-canongate HOSTNAMES := pi-broughton blade-canongate
MASTER_NODE := pi-broughton MASTER_NODE := pi-broughton