nnd
/
ports
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for XDG unification

This commit is contained in:
Alex D. 2023-12-14 09:56:14 +00:00
parent 5563c36938
commit b5362e182f
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
12 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/nnd-s6-services/APKBUILD
View File

@ -3,7 +3,7 @@
. ../../APKBUILD.template
pkgname=nnd-s6-services
pkgver=2.61
pkgver=2.64
pkgrel=2
pkgdesc="Base services for s6"
depends="s6-rc s6-portable-utils s6-linux-utils"

1
main/nnd-s6-services/env/xdg/HOME vendored Normal file
View File

@ -0,0 +1 @@
/root

1
main/nnd-s6-services/env/xdg/XDG_CACHE_HOME vendored Normal file
View File

@ -0,0 +1 @@
/var/cache

1
main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME vendored Normal file
View File

@ -0,0 +1 @@
/etc

1
main/nnd-s6-services/env/xdg/XDG_DATA_HOME vendored Normal file
View File

@ -0,0 +1 @@
/usr/share

1
main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR vendored Normal file
View File

@ -0,0 +1 @@
/run

1
main/nnd-s6-services/env/xdg/XDG_STATE_HOME vendored Normal file
View File

@ -0,0 +1 @@
/var/lib

12
main/nnd-s6-services/manage.sh
View File

@ -11,8 +11,8 @@ alt_ab() {
if [ "$1" == "a" ]; then echo "b"; else echo "a"; fi
}
: ${S6_PATH:='/etc/s6'}
: ${S6_DIST_PATH:="/usr/share/nnd/s6/dist"}
: ${S6_PATH:="${XDG_DATA_HOME:="/etc"}/s6"}
: ${S6_DIST_PATH:="${XDG_CONFIG_HOME:="/usr/share"}/nnd/s6/dist"}
: ${S6_RC_PATH:="$S6_PATH/rc"}
: ${S6_ENV_PATH:="$S6_PATH/env"}
: ${S6_SV_PATH:="$S6_PATH/sv"}
@ -125,8 +125,8 @@ custom() {
}
customfunc() {
: ${src:?Missing src in customfunc}
: ${target:?Missing target in customfunc}
: ${src:?"Missing src in customfunc"}
: ${target:?"Missing target in customfunc"}
if ! rm "$target"; then
error "Failed to remove distributed directory $target"
return "$?"
@ -139,8 +139,8 @@ customfunc() {
}
defaultfunc() {
: ${src:?Missing src in defaultfunc}
: ${target:?Missing target in defaultfunc}
: ${src:?"Missing src in defaultfunc"}
: ${target:?"Missing target in defaultfunc"}
if ! rm -rf "$target"; then
error "Failed to remove custom directory $target"
return "$?"

0
main/nnd-s6-services/rc/partprobe/dependencies.d/bundle.hw-coldplug Normal file
View File

1
main/nnd-s6-services/rc/partprobe/type Normal file
View File

@ -0,0 +1 @@
oneshot

5
main/nnd-s6-services/rc/partprobe/up Normal file
View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
s6-envdir -I /etc/s6/env/path
emptyenv -p
partprobe

6
main/nnd-s6-services/tmpl/partprobe Executable file
View File

@ -0,0 +1,6 @@
#!/bin/execlineb -W
importas -i DISK DISK
s6-envdir -I /etc/s6/env/path
partprobe $DISK