From b6ec5073e08d948eb500c1252d8380c2d8646152 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 8 Dec 2019 07:44:57 +0100
Subject: [PATCH] Expand entrypoint feedback.

---
 .deploy/docker/entrypoint.sh | 18 +++++++++++++++++-
 .env.example                 | 14 +++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh
index 11e0501787..259c32b02c 100755
--- a/.deploy/docker/entrypoint.sh
+++ b/.deploy/docker/entrypoint.sh
@@ -68,8 +68,11 @@ if [[ $DKR_RUN_MIGRATION != "false" ]]; then
 fi
 
 # there are 13 upgrade commands
+if [[ $DKR_RUN_UPGRADE == "false" ]]; then
+  echo 'Will NOT run upgrade commands.'
+fi
 
-if [[ $DKR_RUN_MIGRATION != "false" ]]; then
+if [[ $DKR_RUN_UPGRADE != "false" ]]; then
   php artisan firefly-iii:transaction-identifiers
   php artisan firefly-iii:migrate-to-groups
   php artisan firefly-iii:account-currencies
@@ -86,6 +89,10 @@ if [[ $DKR_RUN_MIGRATION != "false" ]]; then
 fi
 
 # there are 15 verify commands
+if [[ $DKR_RUN_VERIFY == "false" ]]; then
+  echo 'Will NOT run verify commands.'
+fi
+
 if [[ $DKR_RUN_VERIFY != "false" ]]; then
   php artisan firefly-iii:fix-piggies
   php artisan firefly-iii:create-link-types
@@ -105,6 +112,10 @@ if [[ $DKR_RUN_VERIFY != "false" ]]; then
 fi
 
 # report commands
+if [[ $DKR_RUN_REPORT == "false" ]]; then
+  echo 'Will NOT run report commands.'
+fi
+
 if [[ $DKR_RUN_REPORT != "false" ]]; then
   php artisan firefly-iii:report-empty-objects
   php artisan firefly-iii:report-sum
@@ -112,6 +123,11 @@ fi
 
 
 php artisan firefly-iii:restore-oauth-keys
+
+if [[ $DKR_RUN_REPORT == "false" ]]; then
+  echo 'Will NOT generate new OAuth keys.'
+fi
+
 if [[ $DKR_RUN_PASSPORT_INSTALL != "false" ]]; then
   php artisan passport:install
 fi
diff --git a/.env.example b/.env.example
index 12a51c6af6..8f6ed69a67 100644
--- a/.env.example
+++ b/.env.example
@@ -174,32 +174,32 @@ DISABLE_FRAME_HEADER=false
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.
-# Set each value to "true" to enable, or "false" to disable.
+# Set each value to true to enable, or false to disable.
 
 # Check if the SQLite database exists. Can be skipped if you're not using SQLite.
 # Won't significantly speed up things.
-DKR_CHECK_SQLITE="true"
+DKR_CHECK_SQLITE=true
 
 # Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
 # and is up to date.
-DKR_RUN_MIGRATION="true"
+DKR_RUN_MIGRATION=true
 
 # Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
 # with the latest fixes (outside of migrations!)
-DKR_RUN_UPGRADE="true"
+DKR_RUN_UPGRADE=true
 
 # Verify database integrity. Includes all data checks and verifications.
 # Disabling this makes Firefly III assume your DB is intact.
-DKR_RUN_VERIFY="true"
+DKR_RUN_VERIFY=true
 
 # Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
 # Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
-DKR_RUN_REPORT="true"
+DKR_RUN_REPORT=true
 
 # Generate OAuth2 keys.
 # When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
 # you had previously generated keys already and they're stored in your database for restauration.
-DKR_RUN_PASSPORT_INSTALL="true"
+DKR_RUN_PASSPORT_INSTALL=true
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.