aboutsummaryrefslogtreecommitdiff
path: root/scripts/upgrade
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2019-05-15 23:25:50 +0200
committerGitHub <noreply@github.com>2019-05-15 23:25:50 +0200
commitdbf54b44465bb11e4161e2c0c614e293213c70fd (patch)
tree6a51a0b807ec5fe53565bf8f365c01f986f7a34c /scripts/upgrade
parentf6bf3f01c9bbe6862cb8360e05245672e33963e5 (diff)
parent7dc905542a19caab58eb5769165d7b1426492f8c (diff)
downloadmastodon_ynh-dbf54b44465bb11e4161e2c0c614e293213c70fd.tar.gz
mastodon_ynh-dbf54b44465bb11e4161e2c0c614e293213c70fd.tar.bz2
mastodon_ynh-dbf54b44465bb11e4161e2c0c614e293213c70fd.zip
Merge pull request #143 from YunoHost-Apps/cleanup
Cleanup dependencies
Diffstat (limited to 'scripts/upgrade')
-rw-r--r--scripts/upgrade15
1 files changed, 5 insertions, 10 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index 7562d85..93cb3f0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -104,6 +104,9 @@ if [[ -z "$vapid_private_key" ]]; then
ynh_app_setting_set "$app" vapid_public_key "$vapid_public_key"
fi
+#Remove previous added repository
+ynh_remove_extra_repo
+
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
@@ -166,17 +169,9 @@ ynh_add_nginx_config 'port_web port_stream'
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=24
-# Install extra_repo debian package backports & yarn
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
- ynh_install_extra_repo --repo="deb http://httpredir.debian.org/debian jessie-backports main" --append
-fi
-ynh_install_extra_repo --repo="deb https://dl.yarnpkg.com/debian/ stable main" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" --append
-
-# Install nodejs
ynh_install_nodejs --nodejs_version="8"
-
-# TODO: use the same mecanism with other files
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies $pkg_dependencies
+ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
#=================================================
# CREATE DEDICATED USER