From 6bebda5ed0354586bb319797a8be29617edb2562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:59:44 +0200 Subject: [PATCH] remove yarn --- manifest.toml | 8 -------- scripts/_common.sh | 2 -- scripts/install | 21 --------------------- scripts/remove | 7 ------- scripts/restore | 7 ------- scripts/upgrade | 24 ------------------------ 6 files changed, 69 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7d88ff1..13c5260 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,11 +56,3 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - - [resources.apt] - packages = "" - - extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" - extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" - extras.yarn.packages = "yarn" - \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index b818f0f..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -nodejs_version=16 - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 57bffee..cb23c70 100644 --- a/scripts/install +++ b/scripts/install @@ -23,14 +23,6 @@ synapse_port=$(ynh_app_setting_get --app=$synapse_app --key=synapse_port) ynh_app_setting_set --app=$app --key=synapse_domain --value=$synapse_domain ynh_app_setting_set --app=$app --key=synapse_port --value=$synapse_port -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=20 - -# Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -53,19 +45,6 @@ ynh_add_nginx_config # Create NGINX config to access /_synapse/admin endpoint ynh_add_config --template="endpoint.nginx.conf" --destination="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" -#================================================= -# SPECIFIC SETUP -#============================================== -# INSTALL SYNAPSE-ADMIN -#============================================== -ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=20 - -pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less yarn install - ynh_exec_warn_less yarn build -popd - #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index bdc4abe..818dde6 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,13 +17,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE DEPENDENCIES -#================================================= - -# Remove metapackage and its dependencies -ynh_remove_nodejs - #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index aa8a742..5ad44b5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,13 +29,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# SPECIFIC RESTORATION -#================================================= - -# Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version - #================================================= # RESTORE THE LOGROTATE CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index edf96c1..705c98f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,30 +50,6 @@ ynh_add_nginx_config # Create NGINX config to access /_synapse/admin endpoint ynh_add_config --template="endpoint.nginx.conf" --destination="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=18 - -# Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version - -#================================================= -# SPECIFIC UPGRADE -#============================================== -# INSTALL CODIMD -#============================================== -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=20 - - pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less yarn install - ynh_exec_warn_less yarn build - popd -fi - #================================================= # ADD A CONFIGURATION #=================================================