diff --git a/README.md b/README.md index ac7729b..7846fbb 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Garradin (word meaning money in an aboriginal dialect of northern Australia, pronounced "gar-a-dine" em) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc. . -**Shipped version:** 1.1.19~ynh1 +**Shipped version:** 1.1.20~ynh1 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 23df04b..0466ccb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. -**Version incluse :** 1.1.19~ynh1 +**Version incluse :** 1.1.20~ynh1 **Démo :** https://garradin.eu/essai/ diff --git a/conf/app.src b/conf/app.src index 72fdf95..73ee0d8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.19.tar.gz -SOURCE_SUM=f7f05270b18f590ebd417d52d2f8a4358daee11a9e2a8c65e83cbbc18762f62c +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.20.tar.gz +SOURCE_SUM=e936040d69bdba728c9cf85b6f24686a6646f359c5c709f02c47dcf3195ef43c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index b468e8b..920dde0 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,4 +26,4 @@ location __PATH__/ { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; -} +} \ No newline at end of file diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 5f1eb97..1881d9c 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -427,4 +427,4 @@ catch_workers_output = yes ; php_admin_value[max_execution_time] = 600 ; php_admin_value[max_input_time] = 300 ; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On +; php_admin_flag[short_open_tag] = On \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3b64bc2..fddd489 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "1.1.19~ynh1", + "version": "1.1.20~ynh1", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", @@ -51,4 +51,4 @@ } ] } -} +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 470d603..3dad206 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -21,4 +21,4 @@ extra_php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php$ #================================================= # FUTURE OFFICIAL HELPERS -#================================================= +#================================================= \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index 75ce3e0..3f2e4db 100644 --- a/scripts/backup +++ b/scripts/backup @@ -55,4 +55,4 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." \ No newline at end of file diff --git a/scripts/change_url b/scripts/change_url index 21df615..4d9e219 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -108,4 +108,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression --message="Change of URL completed for $app" --last \ No newline at end of file diff --git a/scripts/install b/scripts/install index 3519255..4f06d80 100644 --- a/scripts/install +++ b/scripts/install @@ -125,4 +125,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Garradin completed" --last +ynh_script_progression --message="Installation of Garradin completed" --last \ No newline at end of file diff --git a/scripts/remove b/scripts/remove index cf50e90..eebf208 100644 --- a/scripts/remove +++ b/scripts/remove @@ -68,4 +68,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression --message="Removal of $app completed" --last \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 3d4048b..6c9f875 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,4 +100,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression --message="Restoration completed for $app" --last \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 771b894..9574a8e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,8 +37,8 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # Restore it if the upgrade fails - ynh_restore_upgradebackup + # Restore it if the upgrade fails + ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -200,10 +200,10 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=5 + ynh_script_progression --message="Upgrading source files..." --weight=5 - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --keep="config.local.user.php" --dest_dir="$final_path" + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --keep="config.local.user.php" --dest_dir="$final_path" fi #================================================= @@ -301,4 +301,4 @@ ynh_local_curl "/admin/index.php" # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last \ No newline at end of file