From 9a6da3e4007bcf73d3b681418091f4a7168a6a77 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Wed, 20 Jan 2021 14:36:26 +0100
Subject: [PATCH] Deprecate UMASK_SET in favor of UMASK in baseimage

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

diff --git a/README.md b/README.md
index 2f8f7c6..6b31366 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,6 @@ services:
       - PUID=1000
       - PGID=1000
       - VERSION=docker
-      - UMASK_SET=022 #optional
       - PLEX_CLAIM= #optional
     volumes:
       - /path/to/library:/config
@@ -103,7 +102,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e VERSION=docker \
-  -e UMASK_SET=022 `#optional` \
   -e PLEX_CLAIM= `#optional` \
   -v /path/to/library:/config \
   -v /path/to/tvseries:/tv \
@@ -123,7 +121,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 VERSION=docker` | Set whether to update plex or not - see Application Setup section. |
-| `-e UMASK_SET=022` | control permissions of files and directories created by Plex |
 | `-e PLEX_CLAIM=` | Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes. |
 | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* |
 | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. |
@@ -297,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu.
 * **23.11.20:** - Add Bionic branch make Focal default.
 * **03.05.20:** - Update exposed ports and example docs for bridge mode.
diff --git a/readme-vars.yml b/readme-vars.yml
index b02f294..efe9de6 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -38,7 +38,6 @@ param_env_vars:
 # 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 Plex"}
   - { env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."}
 
 optional_parameters: |
@@ -106,6 +105,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." }
   - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." }
   - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." }
diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run
index 29fcf82..9845f09 100644
--- a/root/etc/services.d/plex/run
+++ b/root/etc/services.d/plex/run
@@ -1,9 +1,10 @@
 #!/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
 
 echo "Starting Plex Media Server."
 export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m)