diff --git a/README.md b/README.md index f22b95a..72dee4f 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:** 14.0.5~ynh1 +**Shipped version:** 15.0.1~ynh1 **Demo:** https://www.dolibarr.org/onlinedemo diff --git a/README_fr.md b/README_fr.md index 9910ce1..d6a4a2f 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 Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.). -**Version incluse :** 14.0.5~ynh1 +**Version incluse :** 15.0.1~ynh1 **Démo :** https://www.dolibarr.org/onlinedemo diff --git a/conf/app.src b/conf/app.src index ac28227..db7a955 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/14.0.5.tar.gz -SOURCE_SUM=31f4c934e484a9582d8867e4170f1f1acd8c41628b059370a6a449eb6e94ae75 +SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/15.0.1.tar.gz +SOURCE_SUM=3c1d00a710a3a47d7ab3a9efefb51ec35a7e78382474ceb5850157f2fc9cc012 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index dc09add..c774000 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": "14.0.5~ynh1", + "version": "15.0.1~ynh1", "url": "https://www.dolibarr.org/", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index b03b53d..8143e2a 100644 --- a/scripts/install +++ b/scripts/install @@ -146,22 +146,30 @@ ynh_script_progression --message="Finalizing installation..." --weight=1 ynh_script_progression --message="Generate fileconf" --weight=1 ynh_local_curl "/install/fileconf.php" \ "testpost=ok" - + +ynh_exec_fully_quiet sleep 5 + ynh_script_progression --message="installation - step 1" --weight=3 ynh_local_curl "/install/step1.php" \ "testpost=ok" \ "action=set" > /var/log/$app/install1.html + +ynh_exec_fully_quiet sleep 5 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/install2.html +ynh_exec_fully_quiet sleep 5 + ynh_script_progression --message="installation - step 4" --weight=3 ynh_local_curl "/install/step4.php" \ "testpost=ok" \ "action=set" > /var/log/$app/install3.html - + +ynh_exec_fully_quiet sleep 5 + # Generate a random password for the admin user (will be ignored because of LDAP) password=$(ynh_string_random 8) @@ -172,6 +180,8 @@ ynh_local_curl "/install/step5.php" \ "pass=$password" \ "pass_verif=$password" > /var/log/$app/install4.html +ynh_exec_fully_quiet sleep 5 + ynh_script_progression --message="configuring LDAP" --weight=1 # Populate the LDAP parameters diff --git a/scripts/upgrade b/scripts/upgrade index c7075a9..c340445 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -174,13 +174,17 @@ then else ynh_print_warn --message="Step 1 upgrading ended with error" fi - + + ynh_exec_fully_quiet sleep 5 + 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 - + + ynh_exec_fully_quiet sleep 5 + charset=$(mysql -ss -N -e "SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = '$db_name'") if [ "$charset" != "utf8" ] then @@ -191,7 +195,9 @@ then ynh_local_curl "/install/repair.php" \ "force_utf8_on_tables=confirmed" > /var/log/$app/repair.html fi - + + ynh_exec_fully_quiet sleep 5 + 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