From 5b7027fa9d2eae2331562d01dcdacf1502796a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:03:29 +0200 Subject: [PATCH 1/5] update --- manifest.json | 2 +- scripts/upgrade.d/upgrade.17.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.17.sh diff --git a/manifest.json b/manifest.json index cfb68dd..14504f6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage the various aspects of your business or association", "fr": "Gérez les différents aspects de votre activité pro ou associative" }, - "version": "17.0.1~ynh1", + "version": "18.0.1~ynh1", "url": "https://www.dolibarr.org/", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/upgrade.d/upgrade.17.sh b/scripts/upgrade.d/upgrade.17.sh new file mode 100644 index 0000000..8880793 --- /dev/null +++ b/scripts/upgrade.d/upgrade.17.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Target version of the Dolibarr update +next_version="18.0.1" + +# Dolibarr tarball checksum +dolibarr_source_sha256="37bd3c8533b821c241dbb34b0e88349c1d5b43f7ffa6027f0b7970748d1f727a" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index d7ca56a..8880793 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Target version of the Dolibarr update -next_version="17.0.1" +next_version="18.0.1" # Dolibarr tarball checksum -dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC" +dolibarr_source_sha256="37bd3c8533b821c241dbb34b0e88349c1d5b43f7ffa6027f0b7970748d1f727a" From d9d1c1bcd3a5f05f2734b9a7a5e0489f20c76d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:12:56 +0200 Subject: [PATCH 2/5] Update install --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 7ebde47..26ff017 100644 --- a/scripts/install +++ b/scripts/install @@ -86,11 +86,10 @@ ynh_mysql_execute_as_root --sql="ALTER DATABASE $db_name charset=utf8" #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 - # Load the last available version source upgrade.d/upgrade.last.sh -# Create an app.src for the last version of nextcloud +# Create an app.src for the last version of Dolibarr cat > ../conf/app.src << EOF SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/$next_version.tar.gz SOURCE_SUM=$dolibarr_source_sha256 From c10d2fdde6b2b63dbb02de96896b562d95d0845e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 Oct 2023 12:13:08 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 62ce519..e1f0d64 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.). -**Shipped version:** 17.0.1~ynh1 +**Shipped version:** 18.0.1~ynh1 **Demo:** https://www.dolibarr.org/onlinedemo @@ -32,7 +32,6 @@ Dolibarr ERP & CRM is a modern software for managing your professional or associ * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index b1fcaa4..733f59f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.). -**Version incluse :** 17.0.1~ynh1 +**Version incluse :** 18.0.1~ynh1 **Démo :** https://www.dolibarr.org/onlinedemo @@ -32,7 +32,6 @@ Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité profess * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 5d544ff8c7fe21393522b926ecea31ca68fc4948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:13:25 +0200 Subject: [PATCH 4/5] Update install --- scripts/install | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/install b/scripts/install index 26ff017..1236e24 100644 --- a/scripts/install +++ b/scripts/install @@ -23,8 +23,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -#member=0 -#is_public=0 phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -48,8 +46,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -#ynh_app_setting_set --app=$app --key=is_public --value=$is_public -#ynh_app_setting_set --app=$app --key=member --value=$member ynh_app_setting_set --app=$app --key=version --value=$(ynh_app_upstream_version "../manifest.json") #================================================= From 1e1033b94e5ff80b0f7aea0db8e18063f0fefcda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:40:55 +0200 Subject: [PATCH 5/5] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1236e24..c68ac42 100644 --- a/scripts/install +++ b/scripts/install @@ -217,9 +217,9 @@ ynh_permission_update --permission="main" --remove="visitors" #================================================= # MODIFY A CONFIG FILE #================================================= +ynh_script_progression --message="configuring config file" --weight=1 # Setup HTTP auth in conf -ynh_script_progression --message="configuring config file" --weight=1 ynh_replace_string --match_string="dolibarr_main_authentication='dolibarr'" --replace_string="dolibarr_main_authentication='http'" --target_file="$final_path/htdocs/conf/conf.php" #=================================================