From 914058792b3334683c7e987d8c1237d705ab3f11 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Mon, 18 Jan 2021 10:59:42 +0100
Subject: [PATCH] Deprecate UMASK_SET in favor of UMASK in baseimage

---
 README.md                      | 4 +---
 readme-vars.yml                | 5 ++---
 root/etc/services.d/sonarr/run | 7 ++++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 41bbfa4..8d198b4 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=022 #optional
     volumes:
       - <path to data>:/config
       - <path/to/tvseries>:/tv
@@ -105,7 +104,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e UMASK_SET=022 `#optional` \
   -p 8989:8989 \
   -v <path to data>:/config \
   -v <path/to/tvseries>:/tv \
@@ -125,7 +123,6 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London, this is required for Sonarr |
-| `-e UMASK_SET=022` | control permissions of files and directories created by Sonarr |
 | `-v /config` | Database and sonarr configs |
 | `-v /tv` | Location of TV library on disk |
 | `-v /downloads` | Location of download managers output directory |
@@ -238,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **05.04.20:** - Move app to /app.
 * **01.08.19:** - Rebase to Linuxserver LTS mono version.
 * **13.06.19:** - Add env variable for setting umask.
diff --git a/readme-vars.yml b/readme-vars.yml
index 9a59945..2fd6b87 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -37,9 +37,7 @@ param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London, this is required for Sonarr"}
 # optional env variables
-opt_param_usage_include_env: true
-opt_param_env_vars:
-  - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Sonarr"}
+opt_param_usage_include_env: false
 
 # application setup block
 app_setup_block_enabled: true
@@ -48,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "05.04.20:", desc: "Move app to /app." }
   - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
   - { date: "13.06.19:", desc: "Add env variable for setting umask." }
diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run
index f603c57..516eb67 100644
--- a/root/etc/services.d/sonarr/run
+++ b/root/etc/services.d/sonarr/run
@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
 
-UMASK_SET=${UMASK_SET:-022}
-
-umask "$UMASK_SET"
+if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
+  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
+  umask ${UMASK_SET}
+fi
 
 cd /app/sonarr/bin || exit