aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2022-05-10 08:16:06 +0200
committerGitHub <noreply@github.com>2022-05-10 08:16:06 +0200
commit7ac3236dcd465f8cb14f0a3334b443da220f9f96 (patch)
treeedf3a0ede5ed29200550d26c1776c4eb89b7dc9d /scripts
parent3bcaeda6db21f9bf900530b0553f1c77d59b7829 (diff)
parentd524919a124b059f0bea6cecff075604364b020a (diff)
downloadmastodon_ynh-7ac3236dcd465f8cb14f0a3334b443da220f9f96.tar.gz
mastodon_ynh-7ac3236dcd465f8cb14f0a3334b443da220f9f96.tar.bz2
mastodon_ynh-7ac3236dcd465f8cb14f0a3334b443da220f9f96.zip
Merge pull request #326 from YunoHost-Apps/testing
Upgrade to version 3.5.2
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install3
-rw-r--r--scripts/upgrade4
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/install b/scripts/install
index bb99a57..2b7a807 100644
--- a/scripts/install
+++ b/scripts/install
@@ -93,7 +93,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
#=================================================
ynh_script_progression --message="Creating a PostgreSQL database..."
-ynh_psql_test_if_first_run
+
# Create PostgreSQL database
db_name=$(ynh_sanitize_dbid --db_name="${app}_production")
db_user=$(ynh_sanitize_dbid --db_name=$app)
@@ -101,6 +101,7 @@ db_pwd=$(ynh_string_random --length=30)
ynh_app_setting_set --app=$app --key=db_name --value=$db_name
ynh_app_setting_set --app=$app --key=db_user --value=$db_user
ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
+ynh_psql_test_if_first_run
ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;"
diff --git a/scripts/upgrade b/scripts/upgrade
index 3b8290c..9aee01c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -208,8 +208,8 @@ ynh_add_nginx_config
#=================================================
ynh_script_progression --message="Upgrading dependencies..."
-ynh_install_app_dependencies $pkg_dependencies
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less 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"
ynh_install_ruby --ruby_version=$RUBY_VERSION