From 991022c08b5f182f572027b672db65e1fe7b8de4 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Mon, 13 Mar 2023 18:32:02 +0100 Subject: [PATCH 1/5] Update to 17.0.0 Use PHP 8.1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/upgrade.d/upgrade.16.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 7 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.16.sh diff --git a/README.md b/README.md index e7a19a1..31122b2 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 Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.). -**Shipped version:** 16.0.4~ynh1 +**Shipped version:** 17.0.0~ynh1 **Demo:** https://www.dolibarr.org/onlinedemo diff --git a/README_fr.md b/README_fr.md index 4567592..419fdac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.). -**Version incluse :** 16.0.4~ynh1 +**Version incluse :** 17.0.0~ynh1 **Démo :** https://www.dolibarr.org/onlinedemo diff --git a/check_process b/check_process index 684c851..737a376 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=244f3cbdf29d6c694154ec08cead5e27d35c26fc + upgrade=1 from_commit=ecb5cbdd72c42fc33b9377f6a53a5aab3a22c754 backup_restore=1 multi_instance=1 port_already_use=0 @@ -21,5 +21,5 @@ Email= Notification=none ;;; Upgrade options ; commit=CommitHash - name=5 Jul 2019 + name=9.0.4 manifest_arg=domain=DOMAIN&path=PATH&admin=USER& diff --git a/manifest.json b/manifest.json index bde62e4..2a9ceeb 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": "16.0.4~ynh1", + "version": "17.0.0~ynh1", "url": "https://www.dolibarr.org/", "upstream": { "license": "GPL-3.0-or-later", @@ -28,7 +28,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.4-fpm", + "php8.1-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 2d00d44..562acb3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ #================================================= # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.1" php_dependencies="php$YNH_PHP_VERSION-mysql \ php$YNH_PHP_VERSION-imagick \ diff --git a/scripts/upgrade.d/upgrade.16.sh b/scripts/upgrade.d/upgrade.16.sh new file mode 100644 index 0000000..db315bc --- /dev/null +++ b/scripts/upgrade.d/upgrade.16.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Target version of the Dolibarr update +next_version="17.0.0" + +# Dolibarr tarball checksum +dolibarr_source_sha256="30246f1e3eaad21ed6caf32bd261aee0e4b2faa1745c3431ecb39e9da5928d40" \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 25bd1be..db315bc 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="16.0.4" +next_version="17.0.0" # Dolibarr tarball checksum -dolibarr_source_sha256="4C0DA72974DB97E1956CB4A2ABCBFC7777B08E2AB5C1CD4A7C758DF081A4DEE4" \ No newline at end of file +dolibarr_source_sha256="30246f1e3eaad21ed6caf32bd261aee0e4b2faa1745c3431ecb39e9da5928d40" \ No newline at end of file From 7487b2c96364736033cea72a594496de2a89c4a4 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Sun, 21 May 2023 21:40:04 +0200 Subject: [PATCH 2/5] Update to 17.0.1 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.15.sh | 4 ++-- scripts/upgrade.d/upgrade.16.sh | 4 ++-- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 31122b2..898d7a4 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 Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.). -**Shipped version:** 17.0.0~ynh1 +**Shipped version:** 17.0.1~ynh1 **Demo:** https://www.dolibarr.org/onlinedemo diff --git a/README_fr.md b/README_fr.md index 419fdac..d17549a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.0~ynh1 +**Version incluse :** 17.0.1~ynh1 **Démo :** https://www.dolibarr.org/onlinedemo diff --git a/manifest.json b/manifest.json index 2a9ceeb..0e60846 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.0~ynh1", + "version": "17.0.1~ynh1", "url": "https://www.dolibarr.org/", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/upgrade.d/upgrade.15.sh b/scripts/upgrade.d/upgrade.15.sh index 25bd1be..a8ccd1d 100644 --- a/scripts/upgrade.d/upgrade.15.sh +++ b/scripts/upgrade.d/upgrade.15.sh @@ -1,7 +1,7 @@ #!/bin/bash # Target version of the Dolibarr update -next_version="16.0.4" +next_version="16.0.5" # Dolibarr tarball checksum -dolibarr_source_sha256="4C0DA72974DB97E1956CB4A2ABCBFC7777B08E2AB5C1CD4A7C758DF081A4DEE4" \ No newline at end of file +dolibarr_source_sha256="C8298342558E62B955A6F4C01FEDB6A187B2E0C0B2C1681A97158CA979F9304F" \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.16.sh b/scripts/upgrade.d/upgrade.16.sh index db315bc..e5f638a 100644 --- a/scripts/upgrade.d/upgrade.16.sh +++ b/scripts/upgrade.d/upgrade.16.sh @@ -1,7 +1,7 @@ #!/bin/bash # Target version of the Dolibarr update -next_version="17.0.0" +next_version="17.0.1" # Dolibarr tarball checksum -dolibarr_source_sha256="30246f1e3eaad21ed6caf32bd261aee0e4b2faa1745c3431ecb39e9da5928d40" \ No newline at end of file +dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC" \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index db315bc..e5f638a 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.0" +next_version="17.0.1" # Dolibarr tarball checksum -dolibarr_source_sha256="30246f1e3eaad21ed6caf32bd261aee0e4b2faa1745c3431ecb39e9da5928d40" \ No newline at end of file +dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC" \ No newline at end of file From 1ba70de73747081f7ec542a89dff6c93e3837bc4 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Wed, 31 May 2023 11:10:24 +0200 Subject: [PATCH 3/5] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 737a376..ef19d8b 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=ecb5cbdd72c42fc33b9377f6a53a5aab3a22c754 + upgrade=1 from_commit=f8b06e9a578e2d9c62948c46ffe3eca28fc854cf backup_restore=1 multi_instance=1 port_already_use=0 @@ -21,5 +21,5 @@ Email= Notification=none ;;; Upgrade options ; commit=CommitHash - name=9.0.4 + name=10.0.1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER& From e1e1614605f5931878481280d16d3fcf870bfc9c Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Fri, 2 Jun 2023 07:37:03 +0200 Subject: [PATCH 4/5] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index ef19d8b..f2ad9f3 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=f8b06e9a578e2d9c62948c46ffe3eca28fc854cf + upgrade=1 from_commit=9b90f7434caf18f827665b7775d0c3b7688af75f backup_restore=1 multi_instance=1 port_already_use=0 @@ -21,5 +21,5 @@ Email= Notification=none ;;; Upgrade options ; commit=CommitHash - name=10.0.1 + name=10.0.6 manifest_arg=domain=DOMAIN&path=PATH&admin=USER& From f895da52cb7bfe6e2e9beaf3ee4b9f267d5a52ef Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Fri, 2 Jun 2023 08:57:22 +0200 Subject: [PATCH 5/5] Change charset before upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index cdd5f58..666bacb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -203,9 +203,6 @@ SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true EOF - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" chown -R $app: "$final_path" @@ -238,7 +235,10 @@ EOF fi ynh_exec_fully_quiet sleep 5 - + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" + pushd $final_path/htdocs/install/ if php$phpversion upgrade.php $current_version $next_version > /var/log/$app/upgrade.html; then