1 files changed, 21 insertions, 14 deletions

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 2d1fd89..2e58abc 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo << EOL
+cat << EOL
 -------------------------------------
           ____           ___
          / __/__ _______/ (_)
@@ -14,24 +14,31 @@ Support our Open Collective at:
 https://opencollective.com/getferdi/
 EOL
 
+key_file="${DATA_DIR}/FERDI_APP_KEY.txt"
+
+print_app_key_message() {
+  app_key=$1
+  printf '**** App key is %s. ' ${app_key}
+  printf 'You can modify `%s` to update the app key ****\n' ${key_file}
+}
+
 # Create APP key if needed
-if  [[ -f "${DATA_DIR}/FERDI_APP_KEY.txt" ]]; then
-        echo " "
-        echo "**** App Key found ****"
-        APP_KEY=$(cat /data/FERDI_APP_KEY.txt)
-        echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
-elif [[ -z "${APP_KEY}" ]]; then
-        echo "**** Generating Ferdi-server app key for first run ****"
-        adonis key:generate
-        APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
-        echo "${APP_KEY}" > "${DATA_DIR}/FERDI_APP_KEY.txt"
-        echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
+if [ -z ${APP_KEY} ] && [ ! -f ${key_file} ]
+then
+  echo '**** Generating Ferdi-server app key for first run ****'
+  adonis key:generate
+  APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
+  echo ${APP_KEY} > ${key_file}
+  print_app_key_message ${APP_KEY}
+else
+  APP_KEY=$(cat ${key_file})
+  print_app_key_message ${APP_KEY}
 fi
 
 export APP_KEY
 
 node ace migration:run --force
 
-chown -R ${PUID:-1000}:${PGID:-1000} $DATA_DIR /app
+chown -R "${PUID:-1000}":"${PGID:-1000}" "${DATA_DIR}" /app
 
-su-exec ${PUID:-1000}:${PGID:-1000} node server.js
+su-exec "${PUID:-1000}":"${PGID:-1000}" node server.js