Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 17.0.1 #98

Merged
merged 6 commits into from
Jun 2, 2023
Merged

Update to 17.0.1 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
991022c
Update to 17.0.0
mastereur Mar 13, 2023
7487b2c
Update to 17.0.1
mastereur May 21, 2023
248c043
Merge branch 'testing' into testing
mastereur May 21, 2023
1ba70de
Update check_process
mastereur May 31, 2023
e1e1614
Update check_process
mastereur Jun 2, 2023
f895da5
Change charset before upgrade
mastereur Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0~ynh1
**Shipped version:** 17.0.1~ynh1

**Demo:** https://www.dolibarr.org/onlinedemo

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0~ynh1
**Version incluse :** 17.0.1~ynh1

**Démo :** https://www.dolibarr.org/onlinedemo

Expand Down
4 changes: 2 additions & 2 deletions check_process
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
setup_private=0
setup_public=0
upgrade=1
upgrade=1 from_commit=244f3cbdf29d6c694154ec08cead5e27d35c26fc
upgrade=1 from_commit=9b90f7434caf18f827665b7775d0c3b7688af75f
backup_restore=1
multi_instance=1
port_already_use=0
Expand All @@ -21,5 +21,5 @@ Email=
Notification=none
;;; Upgrade options
; commit=CommitHash
name=5 Jul 2019
name=10.0.6
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&
4 changes: 2 additions & 2 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -28,7 +28,7 @@
"multi_instance": true,
"services": [
"nginx",
"php7.4-fpm",
"php8.1-fpm",
"mysql"
],
"arguments": {
Expand Down
8 changes: 4 additions & 4 deletions scripts/upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/upgrade.d/upgrade.15.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
dolibarr_source_sha256="C8298342558E62B955A6F4C01FEDB6A187B2E0C0B2C1681A97158CA979F9304F"
4 changes: 2 additions & 2 deletions scripts/upgrade.d/upgrade.16.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC"
4 changes: 2 additions & 2 deletions scripts/upgrade.d/upgrade.last.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC"