Handle env dists as well

This commit is contained in:
Alex D. 2022-12-03 14:30:40 +00:00
parent fc6a3ac30f
commit cd4bdd9dd3
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
2 changed files with 14 additions and 5 deletions

View File

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

View File

@ -66,10 +66,19 @@ distdefs() {
custom() {
local SVC="$1"
[ -e "$S6_RC_PATH/$SVC" ] || error "Service $SVC doesn't exist"
[ -h "$S6_RC_PATH/$SVC" ] || error "Service $SVC is already a custom instance"
rm -rf "$S6_RC_PATH/$SVC"
cp -r "$S6_DIST_PATH/rc/$SVC" "$S6_RC_PATH/$SVC"
local target="$S6_RC_PATH/$SVC"
[ -e "$target" ] || error "Service $SVC doesn't exist"
[ -h "$target" ] || error "Service $SVC is already a custom instance"
rm -rf "$target"
cp -r "$S6_DIST_PATH/rc/$SVC" "$target"
local target="$S6_ENV_PATH/$SVC"
if [ -e "$target" ]; then
rm -rf "$target"
cp -r "$S6_DIST_PATH/env/$SVC" "$target"
fi
}
cmd="$1"