From 516dc955d27b13c554b2f5a76201da6542a623f7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 12 Apr 2022 22:57:01 +0200 Subject: [PATCH] ynh_exec_warn_less --- scripts/install | 28 ++++++++++++++-------------- scripts/restore | 2 +- scripts/upgrade | 23 ++++++++++++----------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/scripts/install b/scripts/install index 8c3a656..e702c43 100755 --- a/scripts/install +++ b/scripts/install @@ -78,7 +78,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" @@ -167,29 +167,29 @@ pushd "$final_path/backend" set +u; source env/bin/activate set -u; - pip install -r requirements-build.txt - pip install -r requirements.txt - pip install -r requirements-full-preview-generator.txt - pip install -r requirements-db-postgres.txt - pip install -e "." + ynh_exec_warn_less pip install -r requirements-build.txt + ynh_exec_warn_less pip install -r requirements.txt + ynh_exec_warn_less pip install -r requirements-full-preview-generator.txt + ynh_exec_warn_less pip install -r requirements-db-postgres.txt + ynh_exec_warn_less pip install -e "." mkdir sessions_data sessions_lock previews - tracimcli db init - tracimcli user create -e $admin_mail -u $admin --lang $language -p $password --profile administrators - tracimcli user delete -l admin@admin.admin + ynh_exec_warn_less tracimcli db init + ynh_exec_warn_less tracimcli user create -e $admin_mail -u $admin --lang $language -p $password --profile administrators + ynh_exec_warn_less tracimcli user delete -l admin@admin.admin set +u; deactivate set -u; - $ynh_npm install "i18next-conv@<8" -g - ./update_i18n_json_file.sh || exit 1 + ynh_exec_warn_less $ynh_npm install "i18next-conv@<8" -g + ynh_exec_warn_less ./update_i18n_json_file.sh || exit 1 popd pushd "$final_path" echo 'nodeLinker: node-modules' >> .yarnrc.yml - yarn install - ./build_full_frontend.sh + ynh_exec_warn_less yarn install + ynh_exec_warn_less ./build_full_frontend.sh popd -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/restore b/scripts/restore index 7a88236..a6beac1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -94,7 +94,7 @@ chown -R $app:www-data "$datadir" ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index 6ae77ff..d9a11a7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,7 +110,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" @@ -143,26 +143,27 @@ pushd "$final_path/backend" set +u; source env/bin/activate set -u; - pip install -r requirements-build.txt - pip install -r requirements.txt - pip install -r requirements-full-preview-generator.txt - pip install -r requirements-db-postgres.txt - pip install -e "." + ynh_exec_warn_less pip install -r requirements-build.txt + ynh_exec_warn_less ynh_exec_warn_less pip install -r requirements.txt + ynh_exec_warn_less pip install -r requirements-full-preview-generator.txt + ynh_exec_warn_less pip install -r requirements-db-postgres.txt + ynh_exec_warn_less pip install -e "." mkdir sessions_data sessions_lock previews + ynh_exec_warn_less alembic -c development.ini upgrade head set +u; deactivate set -u; - $ynh_npm install "i18next-conv@<8" -g - ./update_i18n_json_file.sh || exit 1 + ynh_exec_warn_less $ynh_npm install "i18next-conv@<8" -g + ynh_exec_warn_less ./update_i18n_json_file.sh || exit 1 popd pushd "$final_path" echo 'nodeLinker: node-modules' >> .yarnrc.yml - yarn install - ./build_full_frontend.sh + ynh_exec_warn_less yarn install + ynh_exec_warn_less ./build_full_frontend.sh popd -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies chmod 750 "$final_path" chmod -R o-rwx "$final_path"