diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 876f51b..3b83a78 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -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" diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh index 3d561af..ad84c78 100755 --- a/main/nnd-s6-services/manage.sh +++ b/main/nnd-s6-services/manage.sh @@ -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"