1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dolibarr_ynh.git synced 2024-09-03 18:35:53 +02:00

Merge pull request #105 from YunoHost-Apps/testing

update
This commit is contained in:
eric_G 2023-10-02 16:12:07 +02:00 committed by GitHub
commit 7f6db50ae8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions

View file

@ -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.). 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 **Demo:** https://www.dolibarr.org/onlinedemo

View file

@ -18,7 +18,7 @@ Si vous navez 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.). 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 **Démo :** https://www.dolibarr.org/onlinedemo

View file

@ -6,7 +6,7 @@
"en": "Manage the various aspects of your business or association", "en": "Manage the various aspects of your business or association",
"fr": "Gérez les différents aspects de votre activité pro ou associative" "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/", "url": "https://www.dolibarr.org/",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

View file

@ -23,8 +23,6 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN admin=$YNH_APP_ARG_ADMIN
#member=0
#is_public=0
phpversion=$YNH_PHP_VERSION phpversion=$YNH_PHP_VERSION
app=$YNH_APP_INSTANCE_NAME 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=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url 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=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") 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 ynh_script_progression --message="Setting up source files..." --weight=1
# Load the last available version # Load the last available version
source upgrade.d/upgrade.last.sh 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 cat > ../conf/app.src << EOF
SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/$next_version.tar.gz SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/$next_version.tar.gz
SOURCE_SUM=$dolibarr_source_sha256 SOURCE_SUM=$dolibarr_source_sha256
@ -222,9 +217,9 @@ ynh_permission_update --permission="main" --remove="visitors"
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="configuring config file" --weight=1
# Setup HTTP auth in conf # 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" ynh_replace_string --match_string="dolibarr_main_authentication='dolibarr'" --replace_string="dolibarr_main_authentication='http'" --target_file="$final_path/htdocs/conf/conf.php"
#================================================= #=================================================

View file

@ -0,0 +1,7 @@
#!/bin/bash
# Target version of the Dolibarr update
next_version="18.0.1"
# Dolibarr tarball checksum
dolibarr_source_sha256="37bd3c8533b821c241dbb34b0e88349c1d5b43f7ffa6027f0b7970748d1f727a"

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Target version of the Dolibarr update # Target version of the Dolibarr update
next_version="17.0.1" next_version="18.0.1"
# Dolibarr tarball checksum # Dolibarr tarball checksum
dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC" dolibarr_source_sha256="37bd3c8533b821c241dbb34b0e88349c1d5b43f7ffa6027f0b7970748d1f727a"