From 231c8d50f421bca8564a37480cff164da7d81538 Mon Sep 17 00:00:00 2001
From: NorbiPeti <norbipeti@norbipeti.eu>
Date: Tue, 28 May 2024 21:25:12 +0200
Subject: [PATCH] Run artisan commands as the Pixelfed user

This fixes some permission issues caused by files created
by root
---
 scripts/install | 32 +++++++++++++++++---------------
 scripts/upgrade | 34 ++++++++++++++++++----------------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9b385c3b..a7495b1b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -108,22 +108,24 @@ ynh_add_supervisor_config --service="${app}-horizon" --template=horizon.conf
 #=================================================
 ynh_script_progression --message="Deploying..." --weight=1
 
+artisan="ynh_exec_as $app php$phpversion artisan"
+
 pushd "$install_dir"
-	php$phpversion artisan -n key:generate --force
-	php$phpversion artisan horizon:install
-	php$phpversion artisan horizon:publish
-	php$phpversion artisan passport:keys
-	php$phpversion artisan config:clear
-	php$phpversion artisan config:cache
-	php$phpversion artisan route:cache
-	php$phpversion artisan view:cache
-	php$phpversion artisan storage:link
-	php$phpversion artisan migrate --force
-	php$phpversion artisan update
-	php$phpversion artisan horizon:purge
-	php$phpversion artisan import:cities 2>/dev/null
-	php$phpversion artisan instance:actor
-	php$phpversion artisan passport:client --personal <<< "\\n"
+	$artisan -n key:generate --force
+	$artisan horizon:install
+	$artisan horizon:publish
+	$artisan passport:keys
+	$artisan config:clear
+	$artisan config:cache
+	$artisan route:cache
+	$artisan view:cache
+	$artisan storage:link
+	$artisan migrate --force
+	$artisan update
+	$artisan horizon:purge
+	$artisan import:cities 2>/dev/null
+	$artisan instance:actor
+	$artisan passport:client --personal <<< "\\n"
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 76ef052e..ae0ea0d8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -175,23 +175,25 @@ fi
 #=================================================
 ynh_script_progression --message="Deploying..."
 
+artisan="ynh_exec_as $app php$phpversion artisan"
+
 pushd "$install_dir"
-	php$phpversion artisan horizon:install
-	php$phpversion artisan horizon:publish
-	php$phpversion artisan passport:keys --force
-	php$phpversion artisan config:clear
-	php$phpversion artisan config:cache
-	php$phpversion artisan route:clear
-	php$phpversion artisan route:cache
-	php$phpversion artisan view:clear
-	php$phpversion artisan view:cache
-	php$phpversion artisan storage:link
-	php$phpversion artisan migrate --force
-	php$phpversion artisan update
-	php$phpversion artisan horizon:purge
-	php$phpversion artisan import:cities 2>/dev/null
-	php$phpversion artisan instance:actor
-	php$phpversion artisan passport:client --personal <<< "\\n"
+	$artisan horizon:install
+	$artisan horizon:publish
+	$artisan passport:keys --force
+	$artisan config:clear
+	$artisan config:cache
+	$artisan route:clear
+	$artisan route:cache
+	$artisan view:clear
+	$artisan view:cache
+	$artisan storage:link
+	$artisan migrate --force
+	$artisan update
+	$artisan horizon:purge
+	$artisan import:cities 2>/dev/null
+	$artisan instance:actor
+	$artisan passport:client --personal <<< "\\n"
 popd
 
 #=================================================