From 3c14127e107507b02f30b785580df679e9bedc67 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 18:10:39 +0200 Subject: [PATCH 1/4] fix horizon --- manifest.json | 2 +- scripts/install | 4 ++++ scripts/upgrade | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 96c2c074..0b352997 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "ActivityPub Federated Image Sharing" }, - "version": "0.9.0~ynh3", + "version": "0.9.0~ynh4", "url": "https://pixelfed.org/", "license": "AGPL-3.0-or-later", "maintainer": [ diff --git a/scripts/install b/scripts/install index 8a234fa2..c8257137 100644 --- a/scripts/install +++ b/scripts/install @@ -158,13 +158,17 @@ ynh_store_file_checksum --file="$config" pushd "$final_path" php7.2 artisan -n key:generate --force + php7.2 artisan horizon:install + php7.2 artisan queue:failed-table php7.2 artisan config:clear php7.2 artisan config:cache php7.2 artisan route:cache + php7.2 artisan view:cache php7.2 artisan storage:link php7.2 artisan migrate --force php7.2 artisan update php7.2 artisan horizon:purge + php7.2 artisan horizon:assets popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d77511da..9d098860 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,14 +177,19 @@ ynh_store_file_checksum --file="$config" #================================================= pushd "$final_path" + php7.2 artisan horizon:install + php7.2 artisan queue:failed-table php7.2 artisan config:clear php7.2 artisan config:cache php7.2 artisan route:clear php7.2 artisan route:cache + php7.2 artisan view:clear + php7.2 artisan view:cache php7.2 artisan storage:link php7.2 artisan migrate --force php7.2 artisan update php7.2 artisan horizon:purge + php7.2 artisan horizon:assets popd #================================================= From b845a2a2e8616d34fad64fde7dec0482a78d7519 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 18:11:07 +0200 Subject: [PATCH 2/4] remove read -p --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9d098860..16043ff4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,7 +77,6 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while) # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - read -p "key" # restore it if the upgrade fails ynh_restore_upgradebackup } From b07d4eec27b157ed5050c3c25a8040538a18b44b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 18:19:55 +0200 Subject: [PATCH 3/4] fix upgrade step --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 16043ff4..2fdafb35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,7 +177,6 @@ ynh_store_file_checksum --file="$config" pushd "$final_path" php7.2 artisan horizon:install - php7.2 artisan queue:failed-table php7.2 artisan config:clear php7.2 artisan config:cache php7.2 artisan route:clear From 2cc45b6147b243ea784e677c096c649dcb1785cc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 19:10:02 +0200 Subject: [PATCH 4/4] fix install steps --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index c8257137..11140814 100644 --- a/scripts/install +++ b/scripts/install @@ -159,7 +159,6 @@ ynh_store_file_checksum --file="$config" pushd "$final_path" php7.2 artisan -n key:generate --force php7.2 artisan horizon:install - php7.2 artisan queue:failed-table php7.2 artisan config:clear php7.2 artisan config:cache php7.2 artisan route:cache