Merge pull request #131 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,7 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
-- [Lee el README en español](README_es.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Shipped version:** 6.1.16~ynh1
+**Shipped version:** 6.1.18~ynh1
 
 **Demo:** <https://demo.firefly-iii.org/login>
 

README_es.md

@@ -19,7 +19,7 @@ No se debe editar a mano.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Versión actual:** 6.1.16~ynh1
+**Versión actual:** 6.1.18~ynh1
 
 **Demo:** <https://demo.firefly-iii.org/login>
 

README_eu.md

@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Paketatutako bertsioa:** 6.1.16~ynh1
+**Paketatutako bertsioa:** 6.1.18~ynh1
 
 **Demoa:** <https://demo.firefly-iii.org/login>
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
 
-**Version incluse :** 6.1.16~ynh1
+**Version incluse :** 6.1.18~ynh1
 
 **Démo :** <https://demo.firefly-iii.org/login>
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Versión proporcionada:** 6.1.16~ynh1
+**Versión proporcionada:** 6.1.18~ynh1
 
 **Demo:** <https://demo.firefly-iii.org/login>
 

README_zh_Hans.md

@@ -19,7 +19,7 @@
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**分发版本：** 6.1.16~ynh1
+**分发版本：** 6.1.18~ynh1
 
 **演示：** <https://demo.firefly-iii.org/login>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Firefly III"
 description.en = "Self-hosted financial manager"
 description.fr = "Gestionnaire de finances personnelles"
 
-version = "6.1.16~ynh1"
+version = "6.1.18~ynh1"
 
 maintainers = []
 
@@ -55,8 +55,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.16/FireflyIII-v6.1.16.zip"
+        url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.18/FireflyIII-v6.1.18.zip"
-        sha256 = "8d3fff814b975565913b54998a13cd231b07ff38e9074551512bcc767016c9ea"
+        sha256 = "18ee2306fad9ab8a6d4460794253621dcbe2dab6b0c9e32823395d3ccff99b25"
         in_subdir = false
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "^FireflyIII-v.*.zip$"

scripts/_common.sh

@@ -1,2 +1,17 @@
 #!/bin/bash
 
+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
+
+#=================================================
+# FUTURE OFFICIAL HELPERS
+#=================================================

scripts/backup

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
@@ -9,8 +13,16 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
+#=================================================
+# BACKUP THE APP MAIN DIR
+#=================================================
+
 ynh_backup --src_path="$install_dir"
 
+#=================================================
+# SYSTEM CONFIGURATION
+#=================================================
+
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

scripts/change_url

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -23,7 +27,7 @@ ynh_script_progression --message="Modifying a config file..."
 domain="$new_domain"
 path="$new_path"
 
-ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
+ynh_add_config --template=".env" --destination="$install_dir/.env"
 chmod 400 "$install_dir/.env"
 chown $app "$install_dir/.env"
 

scripts/install

@@ -11,7 +11,7 @@ ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..."
+ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_setup_source --dest_dir=$install_dir
 
@@ -22,19 +22,22 @@ chmod -R 775 $install_dir/storage
 #=================================================
 # SYSTEL CONFIGURATIONS
 #=================================================
-
+ynh_script_progression --message="Add system configurations related to $app..." --weight=1
-ynh_script_progression --message="Add system configurations related to $app..."
 
 ynh_add_fpm_config
 
 ynh_add_nginx_config
 
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding $app configuration..."
+ynh_script_progression --message="Adding $app configuration..." --weight=1
 
 ynh_add_config --template=".env" --destination="$install_dir/.env"
 
@@ -44,7 +47,7 @@ chown $app "$install_dir/.env"
 #=================================================
 # DEPLOY
 #=================================================
-ynh_script_progression --message="Deploying..."
+ynh_script_progression --message="Deploying..." --weight=1
 
 pushd "$install_dir"
     php$phpversion artisan firefly-iii:upgrade-database
@@ -53,15 +56,6 @@ pushd "$install_dir"
     php$phpversion artisan passport:keys || true
 popd
 
-#=================================================
-# SETUP A CRON
-#=================================================
-ynh_script_progression --message="Setuping a cron..."
-
-ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
-chown root: "/etc/cron.d/$app"
-chmod 644 "/etc/cron.d/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -1,12 +1,16 @@
 #!/bin/bash
 
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing configurations related to $app..."
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 ynh_remove_nginx_config
 

scripts/restore

@@ -7,7 +7,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
 ynh_restore_file --origin_path="$install_dir"
 
@@ -17,14 +17,14 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..."
+ynh_script_progression --message="Restoring the MySQL database..." --weight=1
 
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring configurations related to $app..."
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
@@ -37,7 +37,7 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..."
+ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1
 
 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload

scripts/upgrade

@@ -14,8 +14,7 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-
+ynh_script_progression --message="Upgrading source files..." --weight=1
-ynh_script_progression --message="Upgrading source files..."
 
 ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env storage"
 
@@ -23,33 +22,33 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod -R 775 $install_dir/storage
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading system configurations related to $app..."
-
-ynh_add_fpm_config
-
-ynh_add_nginx_config
-
-#=================================================
-# SPECIFIC UPGRADE
-#=================================================
-
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Updating $app configuration..."
+ynh_script_progression --message="Updating $app configuration..." --weight=1
 
 ynh_add_config --template=".env" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app "$install_dir/.env"
 
+#=================================================
+# REAPPLY SYSTEM CONFIGURATIONS
+#=================================================
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+
+ynh_add_fpm_config
+
+ynh_add_nginx_config
+
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
+
 #=================================================
 # DEPLOYMENT
 #=================================================
-ynh_script_progression --message="Upgrading database..."
+ynh_script_progression --message="Upgrading database..." --weight=4
 
 pushd "$install_dir"
     php$phpversion artisan migrate --seed
@@ -61,15 +60,6 @@ pushd "$install_dir"
     php$phpversion artisan view:clear
 popd
 
-#=================================================
-# SETUP A CRON
-#=================================================
-ynh_script_progression --message="Setting up a cron job ..."
-
-ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
-chown root: "/etc/cron.d/$app"
-chmod 644 "/etc/cron.d/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================