From 51c12eefdc44997d46ed6a26e68c14b86687394b Mon Sep 17 00:00:00 2001 From: grialion <48643945+grialion@users.noreply.github.com> Date: Sat, 5 Jul 2025 11:16:02 +0200 Subject: [PATCH 1/7] fix: makefile rsync dependency, runit installation --- Makefile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index b3ad922..2968185 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ install: lidm uninstall: rm -rf ${DESTDIR}${PREFIX}/bin/lidm ${DESTDIR}/etc/lidm.ini rm -rf ${DESTDIR}/usr/share/man/man{1/lidm.1,5/lidm-config.5}.gz - rm -rf /etc/systemd/system/lidm.service /etc/dinit.d/lidm /etc/runit/sv/lidm + rm -rf ${DESTDIR}/etc/systemd/system/lidm.service ${DESTDIR}/etc/dinit.d/lidm ${DESTDIR}/etc/runit/sv/lidm install-service: @if command -v systemctl &> /dev/null; then \ @@ -68,24 +68,26 @@ install-service: elif command -v s6-service &> /dev/null; then \ make install-service-s6; \ else \ - printf '\x1b[1;31m%s\x1b[0m\n' "Unknown init system, skipping service install..."; \ + printf '\033[1;31m%s\033[0m\n' "Unknown init system, skipping service install..."; \ fi install-service-systemd: - install -m644 ./assets/services/systemd.service /etc/systemd/system/lidm.service - @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 'systemctl enable lidm'" + install -m644 ./assets/services/systemd.service ${DESTDIR}/etc/systemd/system/lidm.service + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'systemctl enable lidm'" install-service-dinit: - install -m644 ./assets/services/dinit /etc/dinit.d/lidm - @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 'dinitctl enable lidm'" + install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'dinitctl enable lidm'" install-service-runit: - rsync -a --no-owner --no-group ./assets/services/runit/. /etc/runit/sv/lidm - @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 'ln -s /etc/runit/sv/lidm /run/runit/service' and 'sv enable lidm'" + mkdir -p ${DESTDIR}/etc/sv/lidm + cp -r ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" install-service-openrc: - install -m755 ./assets/services/openrc /etc/init.d/lidm - @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 'rc-update add lidm'" + install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" install-service-s6: - rsync -a --no-owner --no-group ./assets/services/s6/. /etc/s6/sv/lidm - @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" + mkdir -p ${DESTDIR}/etc/s6/sv/lidm + cp -r ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" pre-commit: codespell From a00a73756c2571af5c0bdc6bfe052aa7e5e8e00d Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 14:50:43 +0200 Subject: [PATCH 2/7] fix: support /etc/sv/ and /etc//sv --- Makefile | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2968185..11e4dfe 100644 --- a/Makefile +++ b/Makefile @@ -71,6 +71,7 @@ install-service: printf '\033[1;31m%s\033[0m\n' "Unknown init system, skipping service install..."; \ fi +ETC_SV_EXISTS=$(shell [ -d /etc/sv ] && echo 1 || echo 0 ) install-service-systemd: install -m644 ./assets/services/systemd.service ${DESTDIR}/etc/systemd/system/lidm.service @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'systemctl enable lidm'" @@ -78,13 +79,27 @@ install-service-dinit: install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'dinitctl enable lidm'" install-service-runit: - mkdir -p ${DESTDIR}/etc/sv/lidm - cp -r ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" + ifeq ($(ETC_SV_EXISTS), 1) + mkdir -p ${DESTDIR}/etc/sv/lidm + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" + else + mkdir -p ${DESTDIR}/etc/s6/sv/lidm + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/s6/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/s6/sv/lidm /var/service'" + endif install-service-openrc: install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" install-service-s6: + ifeq ($(ETC_SV_EXISTS), 1) + mkdir -p ${DESTDIR}/etc/sv/lidm + cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/sv/lidm/ + else + mkdir -p ${DESTDIR}/etc/s6/sv/lidm + cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ + endif + mkdir -p ${DESTDIR}/etc/s6/sv/lidm cp -r ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" From 31c3ad6d42590db39eadcf3f1b594af3b790a031 Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 14:52:13 +0200 Subject: [PATCH 3/7] fix(Makefile): duplicated s6 install --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 11e4dfe..65d2f65 100644 --- a/Makefile +++ b/Makefile @@ -99,9 +99,6 @@ install-service-s6: mkdir -p ${DESTDIR}/etc/s6/sv/lidm cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ endif - - mkdir -p ${DESTDIR}/etc/s6/sv/lidm - cp -r ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" pre-commit: From e8a9e57af9058c5e2ae176879dffd8e222660f25 Mon Sep 17 00:00:00 2001 From: grialion <48643945+grialion@users.noreply.github.com> Date: Sat, 5 Jul 2025 15:13:22 +0200 Subject: [PATCH 4/7] fix(Makefile): comprehensive runit installation --- Makefile | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 65d2f65..e698392 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,13 @@ install-service: elif command -v dinitctl &> /dev/null; then \ make install-service-dinit; \ elif command -v sv &> /dev/null; then \ - make install-service-runit; \ + if [ -d /etc/sv ]; then \ + make install-service-runit-void; \ + elif [ -d /etc/runit/sv ]; then \ + make install-service-runit-artix; \ + else \ + printf '\033[1;31m%s\033[0m\n' "Unknown init system structure, skipping service install..."; \ + fi \ elif command -v rc-update &> /dev/null; then \ make install-service-openrc; \ elif command -v s6-service &> /dev/null; then \ @@ -71,34 +77,26 @@ install-service: printf '\033[1;31m%s\033[0m\n' "Unknown init system, skipping service install..."; \ fi -ETC_SV_EXISTS=$(shell [ -d /etc/sv ] && echo 1 || echo 0 ) install-service-systemd: install -m644 ./assets/services/systemd.service ${DESTDIR}/etc/systemd/system/lidm.service @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'systemctl enable lidm'" install-service-dinit: install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'dinitctl enable lidm'" -install-service-runit: - ifeq ($(ETC_SV_EXISTS), 1) - mkdir -p ${DESTDIR}/etc/sv/lidm - cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" - else - mkdir -p ${DESTDIR}/etc/s6/sv/lidm - cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/s6/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/s6/sv/lidm /var/service'" - endif +install-service-runit-void: + mkdir -p ${DESTDIR}/etc/sv/lidm + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" +install-service-runit-artix: + mkdir -p ${DESTDIR}/etc/runit/sv/lidm + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/runit/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/runit/sv/lidm /run/runit/service'" install-service-openrc: install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" install-service-s6: - ifeq ($(ETC_SV_EXISTS), 1) - mkdir -p ${DESTDIR}/etc/sv/lidm - cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/sv/lidm/ - else - mkdir -p ${DESTDIR}/etc/s6/sv/lidm - cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ - endif + mkdir -p ${DESTDIR}/etc/s6/sv/lidm + cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" pre-commit: From f67e30991a2fad385feb05f99376cfe9261ea9fd Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 17:53:53 +0200 Subject: [PATCH 5/7] fix(Makedile): proper service install recipes update docs too --- INSTALL.md | 10 +++++++-- Makefile | 47 ++++++++++++++++++++++++++++++--------- assets/services/README.md | 2 +- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index a9c2f02..8f2ce27 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -39,9 +39,15 @@ make install-service # or if you don't like autodetection make install-service-systemd # systemd make install-service-dinit # dinit -make install-service-runit # runit +make install-service-runit # runit (/etc/sv) +make install-service-runit-etc # runit (/etc/runit/sv) make install-service-openrc # openrc -make install-service-s6 # s6 +make install-service-s6 # s6 (/etc/sv) +make install-service-s6-etc # s6 (/etc/s6/sv) + +# For runit and s6, some distros (e.g. Artix) like to put it in /etc//sv +# to better isolate their packages while other distros (e.g. Void) just put it +# in /etc/sv ``` # AUR diff --git a/Makefile b/Makefile index e698392..643a8a1 100644 --- a/Makefile +++ b/Makefile @@ -63,18 +63,24 @@ install-service: make install-service-dinit; \ elif command -v sv &> /dev/null; then \ if [ -d /etc/sv ]; then \ - make install-service-runit-void; \ + make install-service-runit; \ elif [ -d /etc/runit/sv ]; then \ - make install-service-runit-artix; \ + make install-service-runit-etc; \ else \ - printf '\033[1;31m%s\033[0m\n' "Unknown init system structure, skipping service install..."; \ + printf '\033[31m%s\033[0m\n' "Unknown init system structure, skipping service install..." >&2; \ fi \ elif command -v rc-update &> /dev/null; then \ make install-service-openrc; \ elif command -v s6-service &> /dev/null; then \ - make install-service-s6; \ + if [ -d /etc/sv ]; then\ + make install-service-s6; \ + elif [ -d /etc/r6nit/sv ]; then \ + make install-service-s6-etc; \ + else \ + printf '\033[31m%s\033[0m\n' "Unknown init system structure, skipping service install..." >&2; \ + fi \ else \ - printf '\033[1;31m%s\033[0m\n' "Unknown init system, skipping service install..."; \ + printf '\033[1;31m%s\033[0m\n' "Unknown init system, skipping service install..." >&"; \ fi install-service-systemd: @@ -83,18 +89,37 @@ install-service-systemd: install-service-dinit: install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'dinitctl enable lidm'" -install-service-runit-void: - mkdir -p ${DESTDIR}/etc/sv/lidm +install-service-runit: + @if [ ! -e /etc/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/sv doesn't exist" >&2 \ + exit 1 \ + fi + mkdir -p ${DESTDIR}/etc/runit/lidm cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" -install-service-runit-artix: +install-service-runit-etc: + @if [ ! -e /etc/runit/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/s6/sv doesn't exist" >&2 \ + exit 1 \ + fi mkdir -p ${DESTDIR}/etc/runit/sv/lidm - cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/runit/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/runit/sv/lidm /run/runit/service'" + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/s6/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/s6/sv/lidm /var/service'" install-service-openrc: install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" install-service-s6: + @if [ ! -e "${DESTDIR}/etc/sv" ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/sv doesn't exist" >&2 \ + exit 1 \ + fi + mkdir -p ${DESTDIR}/etc/sv/lidm + cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/sv/lidm/ +install-service-s6-etc: + @if [ ! -e "${DESTDIR}/etc/s6/sv" ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/s6/sv doesn't exist" >&2 \ + exit 1 \ + fi mkdir -p ${DESTDIR}/etc/s6/sv/lidm cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/s6/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" @@ -112,8 +137,10 @@ print-version: install uninstall \ install-service \ install-service-s6 \ + install-service-s6-etc \ install-service-dinit \ install-service-runit \ + install-service-runit-etc \ install-service-openrc \ install-service-systemd \ pre-commit \ diff --git a/assets/services/README.md b/assets/services/README.md index f978157..75dc409 100644 --- a/assets/services/README.md +++ b/assets/services/README.md @@ -4,7 +4,7 @@ This folder contains the files necessary to set up lidm on start up for the supp If you don't know what a init system is, you're certainly using `systemd`. -There's make scripts to automatically copy the service files to the proper locations, you just have to run `make install-service-$INIT`. `make install-service` will attempt to detect the init system in use and install for it. +There's make scripts to automatically copy the service files to the proper locations, you just have to run `make install-service-$INIT` (or `make install-service-$INIT-etc`). `make install-service` will attempt to detect the init system in use and install for it. The manual steps for installation are: From 56e8897565ad44ca7e497caf91ad89ad205b60c3 Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 18:15:29 +0200 Subject: [PATCH 6/7] fix(Makefile): wrong path --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 643a8a1..0ed2310 100644 --- a/Makefile +++ b/Makefile @@ -94,17 +94,17 @@ install-service-runit: printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/sv doesn't exist" >&2 \ exit 1 \ fi - mkdir -p ${DESTDIR}/etc/runit/lidm + mkdir -p ${DESTDIR}/etc/sv/lidm cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service'" + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service' or your distro equivalent" install-service-runit-etc: @if [ ! -e /etc/runit/sv ] && [ -z "$FORCE" ]; then \ - printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/s6/sv doesn't exist" >&2 \ + printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/runit/sv doesn't exist" >&2 \ exit 1 \ fi mkdir -p ${DESTDIR}/etc/runit/sv/lidm - cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/s6/sv/lidm/ - @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/s6/sv/lidm /var/service'" + cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/runit/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/runit/sv/lidm /run/runit/service' or your distro equivalent" install-service-openrc: install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" @@ -115,6 +115,7 @@ install-service-s6: fi mkdir -p ${DESTDIR}/etc/sv/lidm cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/sv/lidm/ + @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" install-service-s6-etc: @if [ ! -e "${DESTDIR}/etc/s6/sv" ] && [ -z "$FORCE" ]; then \ printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/s6/sv doesn't exist" >&2 \ From 6384a94f61392ac5a99b683294b88782a5fdaabe Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 18:27:29 +0200 Subject: [PATCH 7/7] pkg(Makefile): make services packaging easier --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 0ed2310..002c4b8 100644 --- a/Makefile +++ b/Makefile @@ -90,16 +90,18 @@ install-service-dinit: install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'dinitctl enable lidm'" install-service-runit: - @if [ ! -e /etc/sv ] && [ -z "$FORCE" ]; then \ - printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/sv doesn't exist" >&2 \ + @if [ ! -e /etc/sv ] && [ -d /etc/runit/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "/etc/sv doesn't exist but /etc/runit/sv does" >&2 \ + printf '\033[31m%s\033[0m\n' "you probably meant to 'make install-service-runit-etc'" >&2 \ exit 1 \ fi mkdir -p ${DESTDIR}/etc/sv/lidm cp -r --update=all ./assets/services/runit/* ${DESTDIR}/etc/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'ln -s ${DESTDIR}/etc/sv/lidm /var/service' or your distro equivalent" install-service-runit-etc: - @if [ ! -e /etc/runit/sv ] && [ -z "$FORCE" ]; then \ - printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/runit/sv doesn't exist" >&2 \ + @if [ ! -e /etc/runit/sv ] && [ -d /etc/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "/etc/runit/sv doesn't exist but /etc/sv does" >&2 \ + printf '\033[31m%s\033[0m\n' "you probably meant to 'make install-service-runit'" >&2 \ exit 1 \ fi mkdir -p ${DESTDIR}/etc/runit/sv/lidm @@ -109,16 +111,18 @@ install-service-openrc: install -m755 ./assets/services/openrc ${DESTDIR}/etc/init.d/lidm @printf '\033[1m%s\033[0m\n\n' " don't forget to run 'rc-update add lidm'" install-service-s6: - @if [ ! -e "${DESTDIR}/etc/sv" ] && [ -z "$FORCE" ]; then \ - printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/sv doesn't exist" >&2 \ + @if [ ! -e /etc/sv ] && [ -d /etc/s6/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "/etc/sv doesn't exist but /etc/s6/sv does" >&2 \ + printf '\033[31m%s\033[0m\n' "you probably meant to 'make install-service-s6-etc'" >&2 \ exit 1 \ fi mkdir -p ${DESTDIR}/etc/sv/lidm cp -r --update=all ./assets/services/s6/* ${DESTDIR}/etc/sv/lidm/ @printf '\033[1m%s\033[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" install-service-s6-etc: - @if [ ! -e "${DESTDIR}/etc/s6/sv" ] && [ -z "$FORCE" ]; then \ - printf '\033[31m%s\033[0m\n' "${DESTDIR}/etc/s6/sv doesn't exist" >&2 \ + @if [ ! -e /etc/s6/sv ] && [ -d /etc/sv ] && [ -z "$FORCE" ]; then \ + printf '\033[31m%s\033[0m\n' "/etc/s6/sv doesn't exist but /etc/sv does" >&2 \ + printf '\033[31m%s\033[0m\n' "you probably meant to 'make install-service-s6'" >&2 \ exit 1 \ fi mkdir -p ${DESTDIR}/etc/s6/sv/lidm