Merge remote-tracking branch 'upstream/main'

ct/firefly.sh

@@ -37,21 +37,19 @@ check_container_resources
     msg_info "Updating ${APP} to v${RELEASE}"
     cp /opt/firefly/.env /opt/.env
     cp -r /opt/firefly/storage /opt/storage
-    rm -rf /opt/firefly/*
     cd /opt
     wget -q "https://github.com/firefly-iii/firefly-iii/releases/download/v${RELEASE}/FireflyIII-v${RELEASE}.tar.gz"
     tar -xzf FireflyIII-v${RELEASE}.tar.gz -C /opt/firefly --exclude='storage'
+    cp /opt/.env /opt/firefly/.env
+    cp -r /opt/storage /opt/firefly/storage
     cd /opt/firefly 
-    composer install --no-dev --no-interaction &>/dev/null
-    php artisan migrate --seed --force &>/dev/null
-    php artisan firefly:decrypt-all &>/dev/null
-    php artisan cache:clear &>/dev/null
-    php artisan view:clear &>/dev/null
-    php artisan firefly:upgrade-database &>/dev/null
-    php artisan firefly:laravel-passport-keys &>/dev/null
     chown -R www-data:www-data /opt/firefly
     chmod -R 775 /opt/firefly/storage
-
+    $STD php artisan migrate --seed --force
+    $STD php artisan cache:clear
+    $STD php artisan view:clear
+    $STD php artisan firefly-iii:upgrade-database
+    $STD php artisan firefly-iii:laravel-passport-keys
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
     msg_ok "Updated ${APP} to v${RELEASE}"
 
@@ -76,4 +74,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"