From 30ed04dcd4e513d5eb21de313323483f75e246c1 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Sun, 17 Jan 2021 20:25:00 +0100
Subject: [PATCH] Deprecate UMASK_SET in favor of UMASK in baseimage

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

diff --git a/README.md b/README.md
index 6b9ebc7..80e6cb0 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=022 #optional
     volumes:
       - /path/to/data:/config
       - /path/to/movies:/movies
@@ -104,7 +103,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e UMASK_SET=022 `#optional` \
   -p 7878:7878 \
   -v /path/to/data:/config \
   -v /path/to/movies:/movies \
@@ -124,7 +122,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 Radarr |
-| `-e UMASK_SET=022` | control permissions of files and directories created by Radarr |
 | `-v /config` | Database and Radarr configs |
 | `-v /movies` | Location of Movie library on disk (See note in Application setup) |
 | `-v /downloads` | Location of download managers output directory (See note in Application setup) |
@@ -241,6 +238,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **11.30.20:** - Publish `develop` tag.
 * **11.28.20:** - Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal)).
 * **05.04.20:** - Move app to /app.
diff --git a/readme-vars.yml b/readme-vars.yml
index 774bc1f..1c1f932 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -36,9 +36,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 Radarr"}
 # 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 Radarr"}
+opt_param_usage_include_env: false
 
 # application setup block
 app_setup_block_enabled: true
@@ -51,6 +49,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "11.30.20:", desc: "Publish `develop` tag." }
   - { date: "11.28.20:", desc: "Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal))." }
   - { date: "05.04.20:", desc: "Move app to /app." }
diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run
index 9dfd9ae..a2a313a 100644
--- a/root/etc/services.d/radarr/run
+++ b/root/etc/services.d/radarr/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/radarr/bin || exit