From 4d236e63823b1bbf2a49a840c835528a95b6e93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Sun, 13 Jul 2025 09:58:47 +0200
Subject: [PATCH] Firefly: Move to prebuild archive as installation source
 (#5952)

---
 ct/firefly.sh              | 2 +-
 install/firefly-install.sh | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ct/firefly.sh b/ct/firefly.sh
index ead098e0a..87d12709d 100644
--- a/ct/firefly.sh
+++ b/ct/firefly.sh
@@ -39,7 +39,7 @@ function update_script() {
     cp -r /opt/firefly/storage /opt/storage
     msg_ok "Backed up data"
 
-    fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii"
+    fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii" "prebuild" "latest" "/opt/firefly" "FireflyIII-*.zip"
 
     msg_info "Updating ${APP} to v${RELEASE}"
     rm -rf /opt/firefly/storage
diff --git a/install/firefly-install.sh b/install/firefly-install.sh
index 9e9b55853..f0c714e73 100644
--- a/install/firefly-install.sh
+++ b/install/firefly-install.sh
@@ -13,14 +13,9 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y apache2
-msg_ok "Installed Dependencies"
-
 PHP_VERSION="8.4" PHP_APACHE="YES" PHP_MODULE="mysql" setup_php
 setup_composer
 setup_mariadb
-fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii"
 LOCAL_IP=$(hostname -I | awk '{print $1}')
 
 msg_info "Setting up database"
@@ -38,6 +33,8 @@ mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRI
 } >>~/firefly.creds
 msg_ok "Set up database"
 
+fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii" "prebuild" "latest" "/opt/firefly" "FireflyIII-*.zip"
+
 msg_info "Configuring Firefly III (Patience)"
 chown -R www-data:www-data /opt/firefly
 chmod -R 775 /opt/firefly/storage
@@ -45,8 +42,6 @@ cd /opt/firefly
 cp .env.example .env
 sed -i "s/DB_HOST=.*/DB_HOST=localhost/" /opt/firefly/.env
 sed -i "s/DB_PASSWORD=.*/DB_PASSWORD=$DB_PASS/" /opt/firefly/.env
-echo "export COMPOSER_ALLOW_SUPERUSER=1" >>~/.bashrc
-source ~/.bashrc
 $STD composer install --no-dev --no-plugins --no-interaction
 $STD php artisan firefly:upgrade-database
 $STD php artisan firefly:correct-database