diff --git a/conf/app.src b/conf/app.src index 6bbc6b8..98917c3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/elabftw/elabftw/archive/refs/tags/4.2.4.zip -SOURCE_SUM=1922b5dc3eeb6e6feb1b36a041113abb4e43cb19eb6fe5bd211440efc7ef10a4 +SOURCE_URL=https://github.com/elabftw/elabftw/archive/refs/tags/4.3.0-beta4.zip +SOURCE_SUM=7e76c884356312add88741bf26c0d0ad728101e9a824071bb7ab9b9c85363cc7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 160bbf0..4496105 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source electronic lab notebook for research labs", "fr": "Cahier de laboratoire électronique open source pour les laboratoires de recherche" }, - "version": "4.2.4~ynh1", + "version": "4.3.0~ynh1", "url": "https://www.elabftw.net", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/install b/scripts/install index 0279dc5..0365e7e 100644 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 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=phpversion --value=$phpversion #================================================= # INSTALL DEPENDENCIES @@ -66,8 +65,9 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid $app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # INSTALL DEPENDENCIES @@ -137,7 +137,9 @@ ynh_script_progression --message="Installing with Composer..." --weight=30 pushd "$final_path" ynh_script_progression --message="Composer install..." - ynh_exec_warn_less ynh_exec_as $app php$phpversion composer.phar install --prefer-dist --no-progress --no-dev + #ynh_exec_warn_less ynh_exec_as $app php$phpversion composer.phar install --prefer-dist --no-progress --no-dev + +ynh_composer_exec phpversion=$phpversion --workdir=$final_path --commands="install --prefer-dist --no-progress --no-dev" ynh_script_progression --message="Yarn install..." ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npm install --save https://github.com/foliojs/brotli.js/tarball/master