From 3396257528246944c5d3db80d29161741ba1948d Mon Sep 17 00:00:00 2001
From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Wed, 13 Nov 2024 12:12:24 +0100
Subject: [PATCH] feat(docker): skip assets install on permission error

---
 entrypoint.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index e970d34..f7effc9 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
-PERMISSION_ERROR="Check assets directory permissions & docker user or skip default assets install by setting the INIT_ASSETS env var to 0"
-
-# Default assets & exemple configuration installation if possible.
+# Default assets & example configuration installation
 if [[ "${INIT_ASSETS}" == "1" ]] && [[ ! -f "/www/assets/config.yml" ]]; then
     echo "No configuration found, installing default config & assets"
-    if [[ ! -w "/www/assets/" ]]; then echo "Assets directory not writable. $PERMISSION_ERROR" && exit 1; fi
-    
-    while true; do echo n; done | cp -Ri /www/default-assets/* /www/assets/ &> /dev/null
-    if [[ $? -ne 0 ]]; then echo "Fail to copy default assets. $PERMISSION_ERROR" && exit 1; fi
-
-    yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null
-    if [[ $? -ne 0 ]]; then echo "Fail to copy default config file. $PERMISSION_ERROR" && exit 1; fi
+    if [[ -w "/www/assets/" ]]; 
+    then
+        while true; do echo n; done | cp -Ri /www/default-assets/* /www/assets/
+        yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml
+    else
+        echo "Assets directory not writable, skipping default config install.";
+        echo "Check assets directory permissions & docker user or skip default assets install by setting the INIT_ASSETS env var to 0."
+    fi
 fi
 
 echo "Starting webserver"