diff --git a/scripts/_common.sh b/scripts/_common.sh index 6b4020a..406bdfb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app YNH_PHP_VERSION="7.3" - +YNH_COMPOSER_VERSION=2.1.1 extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli" #================================================= diff --git a/scripts/install b/scripts/install index 2771085..a52cab7 100644 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,7 @@ ynh_script_progression --message="Initializing database..." --weight=2 # Install composer ynh_install_composer -ynh_exec_warn_less php$YNH_PHP_VERSION "$final_path/admin/migration.php" +ynh_exec_warn_less php$phpversion "$final_path/admin/migration.php" #================================================= # GENERIC FINALIZATION @@ -131,7 +131,6 @@ ynh_exec_warn_less php$YNH_PHP_VERSION "$final_path/admin/migration.php" # SECURE FILES AND DIRECTORIES #================================================= -chown -R root: "$final_path" chown -R $app: "$final_path/"{tpl_c,admin/stdout.log} #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 41f8b55..28f3128 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,6 +23,7 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) email=$(ynh_app_setting_get --app=$app --key=email)