From 928eb5ae24fc8663623f48128ee7eaa2829be4d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 00:55:48 +0000 Subject: [PATCH] build: sync with upstream 2024-08-03 https://github.com/void-linux/void-packages/commit/e1c62c97 --- common/environment/setup/install.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh index 3d2fde7..c82add2 100644 --- a/common/environment/setup/install.sh +++ b/common/environment/setup/install.sh @@ -38,13 +38,10 @@ _vsv() { vmkdir etc/sv vcopy "${FILESDIR}/$service" etc/sv - if [ ! -L "$svdir/run" ]; then - grep -Fq 'exec 2>&1' "$svdir/run" || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n" - chmod 755 "$svdir/run" - fi - if [ -e "$svdir/finish" ] && [ ! -L "$svdir/finish" ]; then - chmod 755 "$svdir/finish" - fi + grep -Fq 'exec 2>&1' "$svdir/run" || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n" + for f in run finish check control/{a,c,d,h,i,k,p,q,t,u,x,1,2}; do + [ -e "$svdir/$f" ] && [ ! -L "$svdir/$f" ] && chmod 755 "$svdir/$f" + done ln ${LN_OPTS} "/run/runit/supervise.${service}" "$svdir/supervise" if [ -d "$svdir/log" ] || [ -L "$svdir/log" ]; then msg_warn "$pkgver: vsv: overriding default log service\n"