From 74613c402d838892d92980dacab580cb68d45da7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 26 Sep 2021 20:52:46 +0200 Subject: [PATCH] Fix --- scripts/_common.sh | 2 +- scripts/install | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5745215..b1789db 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ MEMORY_NEEDED="2560" # dependencies used by the app -pkg_dependencies="build-essential ffmpeg redis-server redis-tools postgresql postgresql-contrib" +pkg_dependencies="build-essential ffmpeg postgresql postgresql-contrib" NODEJS_VERSION="12" diff --git a/scripts/install b/scripts/install index ee03340..0ff25e5 100755 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -69,7 +65,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -#curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= @@ -134,9 +129,9 @@ chown $app:$app "$final_path/.config/default.yml" ynh_script_progression --message="Installing Misskey..." --weight=15 pushd "$final_path" - ynh_exec_warn_less yarn add ts-node webpack - ynh_exec_warn_less NODE_ENV=production yarn build - ynh_exec_warn_less yarn run init + ynh_exec_as $app env $ynh_node_load_PATH yarn add ts-node webpack + ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build + ynh_exec_as $app env $ynh_node_load_PATH yarn run init popd #=================================================