release: v1.2.1

update docs too

.github/workflows/make-release.yml

@@ -84,15 +84,15 @@ jobs:
           chown $UID:$(id -g) . -R
 
       - run: |
-          BRANCH=actions/update-aur-${{ inputs.version }}
+          BRANCH=actions/update-aur-${{ needs.release-checks.outputs.VERSION }}
           git config --global --add safe.directory $GITHUB_WORKSPACE
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
           git checkout -b $BRANCH
-          git commit -am "Update AUR pkgs to v${{ inputs.version }}"
+          git commit -am "Update AUR pkgs to v${{ needs.release-checks.outputs.VERSION }}"
           git push -u origin $BRANCH
           gh pr create --head $BRANCH \
-            --title "[AUR update]: Bump to ${{ inputs.version }}" \
+            --title "[AUR update]: Bump to ${{ needs.release-checks.outputs.VERSION }}" \
             --body "*This PR was created automatically*"
         env:
           GH_TOKEN: ${{ github.token }}

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/<init>/sv
+# to better isolate their packages while other distros (e.g. Void) just put it
+# in /etc/sv
 ```
 
 # AUR

Makefile

@@ -1,4 +1,4 @@
-VERSION = 1.2.0
+VERSION = 1.2.1
 .DEFAULT_GOAL := lidm
 
 CDIR=src
@@ -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 \
@@ -62,30 +62,72 @@ 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; \
+		elif [ -d /etc/runit/sv ]; then \
+			make install-service-runit-etc; \
+		else \
+			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 '\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'"
+	@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 ] && [ -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
+	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 /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'"
+	@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 /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
+	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:
 	codespell
@@ -100,8 +142,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 \

assets/pkg/aur/lidm-bin/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm-bin
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
-	pkgver = 1.1.1
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = x86_64
@@ -8,13 +8,13 @@ pkgbase = lidm-bin
 	depends = pam
 	provides = lidm
 	conflicts = lidm
-	source = lidm::https://github.com/javalsai/lidm/releases/download/v1.1.1/lidm-amd64
-	source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/themes/default.ini
-	source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/assets/man/lidm.1
-	source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/assets/man/lidm-config.5
-	sha256sums = c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf
-	sha256sums = a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542
+	source = lidm::https://github.com/javalsai/lidm/releases/download/v1.2.0/lidm-amd64
+	source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/themes/default.ini
+	source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm.1
+	source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm-config.5
+	sha256sums = 6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d
+	sha256sums = ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca
 	sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8
-	sha256sums = 5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f
+	sha256sums = 0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9
 
 pkgname = lidm-bin

assets/pkg/aur/lidm-bin/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-bin
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 depends=('pam')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
@@ -16,10 +16,10 @@ source=(
     "lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
     "lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
 )
-sha256sums=('c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf'
-            'a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542'
+sha256sums=('6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d'
+            'ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca'
             '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8'
-            '5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f')
+            '0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9')
 
 package() {
     install -Dm755 lidm "${pkgdir}/usr/bin/lidm"

assets/pkg/aur/lidm-git/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-git
-pkgver=1.1.1.r0.g3bfc2f5
+pkgver=1.2.0.r0.g7f75b8e
 pkgrel=1
 depends=('pam')
 makedepends=('git' 'make' 'gcc')

assets/pkg/aur/lidm/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
-	pkgver = 1.1.1
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = any
@@ -8,7 +8,7 @@ pkgbase = lidm
 	makedepends = git
 	makedepends = gcc
 	depends = pam
-	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.1.1.tar.gz
-	sha256sums = 915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479
+	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.0.tar.gz
+	sha256sums = 0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6
 
 pkgname = lidm

assets/pkg/aur/lidm/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 depends=('pam')
 makedepends=('git' 'gcc')
@@ -10,7 +10,7 @@ arch=('any')
 url="https://github.com/javalsai/lidm"
 license=('GPL')
 source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479')
+sha256sums=('0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6')
 
 build() {
     tar -xzf "tarball.tar.gz"

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: