Merge pull request #105 from YunoHost-Apps/testing

update

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
 

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
 

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",

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")
 
 #=================================================
@@ -86,11 +82,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
@@ -222,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"
 
 #=================================================

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"

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"