From 92595b45d83e4d874d9701ce9a3f5488a3bb34d9 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 20 Jun 2022 19:58:23 +0100
Subject: [PATCH] Fix umask handling for v3

---
 root/usr/bin/with-contenv | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv
index e26f8f4..212d908 100755
--- a/root/usr/bin/with-contenv
+++ b/root/usr/bin/with-contenv
@@ -1,7 +1,9 @@
 #! /bin/bash
-if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then
-  umask $(cat /var/run/s6/container_environment/UMASK)
-  exec /command/with-contenv "$@"
-else
-  exec /command/with-contenv "$@"
+
+if [[ -f /var/run/s6/container_environment/UMASK ]] && \
+    { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] || \
+    [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] || \
+    [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then
+    umask $(cat /var/run/s6/container_environment/UMASK)
 fi
+exec /command/with-contenv "$@"