From 892b39acb5d5fbf86f535205fd6c806da52f30d0 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Mon, 18 Jan 2021 09:49:00 +0100
Subject: [PATCH] Deprecate UMASK_SET in favor of UMASK in baseimage

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

diff --git a/README.md b/README.md
index 8d748ec..7a5dac1 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ This image provides various versions that are available via tags. `latest` tag u
 | Tag | Description |
 | :----: | --- |
 | latest | Stable Radarr releases |
+| develop | Radarr releases from their develop branch |
 | nightly | Nightly Radarr releases |
 
 ## Usage
@@ -85,7 +86,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=022 #optional
     volumes:
       - /path/to/data:/config
       - /path/to/movies:/movies
@@ -103,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 \
@@ -123,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) |
@@ -240,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.
 * **09.27.20:** - Merge Preview into Nightly.
 * **05.04.20:** - Move app to /app.
 * **01.08.19:** - Rebase to Linuxserver LTS mono version.
diff --git a/readme-vars.yml b/readme-vars.yml
index 46f57a4..89d43f1 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -18,6 +18,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable Radarr releases" }
+  - { tag: "develop", desc: "Radarr releases from their develop branch" }
   - { tag: "nightly", desc: "Nightly Radarr releases" }
 
 # container parameters
@@ -35,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
@@ -50,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: "09.27.20:", desc: "Merge Preview into Nightly." }
   - { date: "05.04.20:", desc: "Move app to /app." }
   - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run
index 6197abc..cc8a724 100644
--- a/root/etc/services.d/radarr/run
+++ b/root/etc/services.d/radarr/run
@@ -1,7 +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
 
 exec \
 	s6-setuidgid abc /app/radarr/bin/Radarr \