From 747c1888240a6dfd1a0fea8e26a2327f08b462f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Z=C3=BChlcke?= <git@pbz.im>
Date: Sun, 19 Jul 2020 01:31:29 +0200
Subject: [PATCH] Use -prune for "REPLACE_ENV_VARIABLES_EXCLUDE_PATHS" feature.
 (#588)

---
 README.md                    |  8 +++++++-
 start-finalSetupEnvVariables | 15 ++++++++++-----
 start-utils                  |  2 ++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7b83c20d..0d5e7bcb 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,13 @@ There are some limitations to what characters you can use.
 Variables will be replaced in files with the following extensions:
 `.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.
 
-Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`. Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`.
+Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`.
+
+Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. Path
+excludes are recursive. Here is an example:
+```
+REPLACE_ENV_VARIABLES_EXCLUDE_PATHS="/data/plugins/Essentials/userdata/ /data/plugins/MyPlugin/"
+```
 
 Here is a full example where we want to replace values inside a `database.yml`.
 
diff --git a/start-finalSetupEnvVariables b/start-finalSetupEnvVariables
index f64f5ec7..4dfc04ca 100644
--- a/start-finalSetupEnvVariables
+++ b/start-finalSetupEnvVariables
@@ -6,15 +6,20 @@
 
 if isTrue "${REPLACE_ENV_VARIABLES}"; then
   log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
-
   findExcludes=
+
+  # File excludes
   for f in ${REPLACE_ENV_VARIABLES_EXCLUDES}; do
     findExcludes="${findExcludes} -not -name $f"
   done
-  for p in ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}; do
-    findExcludes="${findExcludes} -not -path \"*$p*\""
-  done
-  isDebugging && echo "Using find exclusion: $findExcludes"
+
+  # Directory excludes (recursive)
+  dirExcludes=$(join_by " -o -path " ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS})
+  if [[ $dirExcludes ]]; then
+    findExcludes+=" -type d ( -path ${dirExcludes} ) -prune"
+  fi
+
+  isDebugging && echo "Using find exclusions: $findExcludes"
 
   while IFS='=' read -r name value ; do
     # check if name of env variable matches the prefix
diff --git a/start-utils b/start-utils
index aa8d933a..0c6fd763 100644
--- a/start-utils
+++ b/start-utils
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
+
 function isURL {
   local value=$1