Better text and fixed entry point

This commit is contained in:
James Cole
2019-12-08 05:57:36 +01:00
parent 53d630ef91
commit 78ccca4f58
2 changed files with 14 additions and 12 deletions

View File

@@ -18,10 +18,9 @@ mkdir -p $FIREFLY_PATH/storage/framework/views/v2
mkdir -p $FIREFLY_PATH/storage/logs
mkdir -p $FIREFLY_PATH/storage/upload
if [ $DKR_CHECK_SQLITE != "false" ]
if [[ $DKR_CHECK_SQLITE != "false" ]]; then
echo "Touch DB file (if SQLlite)..."
if [ $DB_CONNECTION == "sqlite" ]
then
if [[ $DB_CONNECTION == "sqlite" ]]; then
touch $FIREFLY_PATH/storage/database/database.sqlite
echo "Touched!"
fi
@@ -58,14 +57,15 @@ echo "Run various artisan commands..."
php artisan cache:clear
if [ $DKR_RUN_MIGRATION != "false" ]
if [[ $DKR_RUN_MIGRATION != "false" ]]; then
php artisan firefly-iii:create-database
php artisan migrate --seed
php artisan firefly-iii:decrypt-all
fi
# there are 13 upgrade commands
if [ $DKR_RUN_MIGRATION != "false" ]
if [[ $DKR_RUN_MIGRATION != "false" ]]; then
php artisan firefly-iii:transaction-identifiers
php artisan firefly-iii:migrate-to-groups
php artisan firefly-iii:account-currencies
@@ -82,7 +82,7 @@ if [ $DKR_RUN_MIGRATION != "false" ]
fi
# there are 15 verify commands
if [ $DKR_RUN_VERIFY != "false" ]
if [[ $DKR_RUN_VERIFY != "false" ]]; then
php artisan firefly-iii:fix-piggies
php artisan firefly-iii:create-link-types
php artisan firefly-iii:create-access-tokens
@@ -101,14 +101,14 @@ if [ $DKR_RUN_VERIFY != "false" ]
fi
# report commands
if [ $DKR_RUN_REPORT != "false" ]
if [[ $DKR_RUN_REPORT != "false" ]]; then
php artisan firefly-iii:report-empty-objects
php artisan firefly-iii:report-sum
fi
php artisan firefly-iii:restore-oauth-keys
if [ $DKR_RUN_PASSPORT_INSTALL != "false" ]
if [[ $DKR_RUN_PASSPORT_INSTALL != "false" ]]; then
php artisan passport:install
fi

View File

@@ -188,13 +188,15 @@ DKR_RUN_MIGRATION="true"
# with the latest fixes (outside of migrations!)
DKR_RUN_UPGRADE="true"
# Disable all data checks and verifications. Disabling this makes Firefly III assume your DB is intact.
# Verify database integrity. Includes all data checks and verifications.
# Disabling this makes Firefly III assume your DB is intact.
DKR_RUN_VERIFY="true"
# Disable all DB reports. When disabled, Firefly III won't go over your data to report current state.
# 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"
# 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"