From b93dcd144b146b28398084e808d98d18c6ecfe57 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Mon, 12 Jul 2021 15:29:03 +0200 Subject: [PATCH 1/3] Update to 13.0.4 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0a211f5..3a2307b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.). -**Shipped version:** 13.0.3 +**Shipped version:** 13.0.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f6a6aee..faa22b6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.). -**Version incluse :** 13.0.3 +**Version incluse :** 13.0.4 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index bd2418b..94ec60b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/13.0.3.tar.gz -SOURCE_SUM=67d7c52c865ab5ea6a6d03ca3c23c82ed6e19cc2ff6d85788197fea81ebc9781 +SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/13.0.4.tar.gz +SOURCE_SUM=92bcfe7bd72e40b6fe9c40105bad9c67c61b23a9c78de5f03fd05d1e95959304 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index d00bf79..d3a943e 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": "13.0.3~ynh1", + "version": "13.0.4~ynh1", "url": "https://www.dolibarr.org/", "license": "GPL-3.0-or-later", "maintainer": { From a9a2f48faae92a8815865774f82d2515e89b9477 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:16:15 +0200 Subject: [PATCH 2/3] Change database to UTF8 #59 Add install app log --- scripts/install | 13 +++++++++---- scripts/upgrade | 25 ++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 345d103..dd3d372 100644 --- a/scripts/install +++ b/scripts/install @@ -63,6 +63,8 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +ynh_mysql_execute_as_root --sql="ALTER DATABASE $db_name charset=utf8" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -149,6 +151,9 @@ ynh_permission_update --permission="main" --add="visitors" ynh_systemd_action --service_name=nginx --action=reload # Installation with curl + +mkdir -p /var/log/$app/ + ynh_script_progression --message="Finalizing installation..." --weight=1 ynh_script_progression --message="Generate fileconf" --weight=1 @@ -158,17 +163,17 @@ ynh_local_curl "/install/fileconf.php" \ ynh_script_progression --message="installation - step 1" --weight=3 ynh_local_curl "/install/step1.php" \ "testpost=ok" \ - "action=set" + "action=set" > /var/log/$app/insatall1.html ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=72 ynh_local_curl "/install/step2.php" \ "testpost=ok" \ - "action=set" + "action=set" > /var/log/$app/insatall2.html ynh_script_progression --message="installation - step 4" --weight=3 ynh_local_curl "/install/step4.php" \ "testpost=ok" \ - "action=set" + "action=set" > /var/log/$app/insatall3.html # Generate a random password for the admin user (will be ignored because of LDAP) password=$(ynh_string_random 8) @@ -178,7 +183,7 @@ ynh_local_curl "/install/step5.php" \ "testpost=ok" \ "action=set" \ "pass=$password" \ - "pass_verif=$password" + "pass_verif=$password" > /var/log/$app/insatall4.html ynh_script_progression --message="configuring LDAP" --weight=1 diff --git a/scripts/upgrade b/scripts/upgrade index 402149e..cd3d349 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -169,19 +169,36 @@ then fi mkdir -p /var/log/$app/ - + # Upgrade with CURL + + # Set the app as temporarily public for cURL call + ynh_permission_update --permission="main" --add="visitors" + pushd $final_path/htdocs/install/ if php$phpversion upgrade.php $current_version $update_version > /var/log/$app/upgrade.html; then ynh_print_info --message="Step 1 upgrading ended successfully" else ynh_print_warn --message="Step 1 upgrading ended with error" fi + if php$phpversion upgrade2.php $current_version $update_version > /var/log/$app/upgrade2.html; then ynh_print_info --message="Step 2 upgrading ended successfully" else ynh_print_warn --message="Step 2 upgrading ended with error" fi + + charset=$(mysql -ss -N -e "SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = '$db_name'") + if [ "$charset" != "utf8" ] + then + ynh_script_progression --message="Changing Database charset to utf8" --weight=5 + + ynh_mysql_execute_as_root --database=$db_name --sql="ALTER DATABASE $db_name charset=utf8" + + ynh_local_curl "/install/repair.php" \ + "force_utf8_on_tables=confirmed" > /var/log/$app/repair.html + fi + if php$phpversion step5.php $current_version $update_version > /var/log/$app/upgrade3.html; then ynh_print_info --message="Step 3 upgrading ended successfully" else @@ -191,6 +208,12 @@ then ynh_app_setting_set --app=$app --key=version --value=$update_version popd + + if [ $is_public -eq 0 ] + then + ynh_permission_update --permission="main" --remove="visitors" + fi + fi #================================================= From 62381d7086a48ceefc6fdc11ed40cf3e656a5cd2 Mon Sep 17 00:00:00 2001 From: mastereur <22839524+mastereur@users.noreply.github.com> Date: Mon, 12 Jul 2021 23:21:37 +0200 Subject: [PATCH 3/3] Rename log file --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index dd3d372..20c287f 100644 --- a/scripts/install +++ b/scripts/install @@ -163,17 +163,17 @@ ynh_local_curl "/install/fileconf.php" \ ynh_script_progression --message="installation - step 1" --weight=3 ynh_local_curl "/install/step1.php" \ "testpost=ok" \ - "action=set" > /var/log/$app/insatall1.html + "action=set" > /var/log/$app/install1.html ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=72 ynh_local_curl "/install/step2.php" \ "testpost=ok" \ - "action=set" > /var/log/$app/insatall2.html + "action=set" > /var/log/$app/install2.html ynh_script_progression --message="installation - step 4" --weight=3 ynh_local_curl "/install/step4.php" \ "testpost=ok" \ - "action=set" > /var/log/$app/insatall3.html + "action=set" > /var/log/$app/install3.html # Generate a random password for the admin user (will be ignored because of LDAP) password=$(ynh_string_random 8) @@ -183,7 +183,7 @@ ynh_local_curl "/install/step5.php" \ "testpost=ok" \ "action=set" \ "pass=$password" \ - "pass_verif=$password" > /var/log/$app/insatall4.html + "pass_verif=$password" > /var/log/$app/install4.html ynh_script_progression --message="configuring LDAP" --weight=1