From 6384a94f61392ac5a99b683294b88782a5fdaabe Mon Sep 17 00:00:00 2001 From: javalsai Date: Sat, 5 Jul 2025 18:27:29 +0200 Subject: [PATCH] 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