diff --git a/.DS_Store b/.DS_Store index 9c7e095..351091e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000..dae0e7c Binary files /dev/null and b/.github/.DS_Store differ diff --git a/scripts/install b/scripts/install index 2384084..9bc12bd 100644 --- a/scripts/install +++ b/scripts/install @@ -138,11 +138,11 @@ pushd "$final_path" ynh_exec_warn_less ynh_exec_as $app php$phpversion composer.phar install --prefer-dist --no-progress --no-dev ynh_script_progression --message="Yarn install..." - ynh_exec_warn_less npm install brotli - ynh_exec_warn_less yarn install --pure-lockfile --prod - ynh_exec_warn_less yarn run buildall + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npm install brotli + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --pure-lockfile --prod + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run buildall ynh_secure_remove node_modules - ynh_exec_warn_less yarn cache clean + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean secret_key=$(ynh_string_random --length=137) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key diff --git a/scripts/restore b/scripts/restore index ff15826..1899045 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,8 +34,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index ec89e1b..7d2eb9e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)