From dc292a50f4472d8ea19c6c17215dddf92852d9cf Mon Sep 17 00:00:00 2001 From: nemsia Date: Thu, 14 Jun 2018 16:11:29 +0200 Subject: [PATCH] Use yarn repo on all scripts * Add yarn to app_dependencies * Remove jessie backports config file --- conf/backports.list | 1 - scripts/install | 13 +++++-------- scripts/remove | 6 ++---- scripts/restore | 18 ++++++++---------- scripts/upgrade | 19 +++++++++---------- 5 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 conf/backports.list diff --git a/conf/backports.list b/conf/backports.list deleted file mode 100644 index c204862..0000000 --- a/conf/backports.list +++ /dev/null @@ -1 +0,0 @@ -deb http://httpredir.debian.org/debian jessie-backports main diff --git a/scripts/install b/scripts/install index c05d617..404d584 100644 --- a/scripts/install +++ b/scripts/install @@ -90,21 +90,18 @@ mkdir -p "$datadir" # install nodejs ynh_install_nodejs 8 -# install yarn -wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.7.0/yarn_1.7.0_all.deb -echo "5fecee8378905bbd0c09f9f49d81d427576e3ebdfe9e71ac47eb6c5c5fe35825 yarn_1.7.0_all.deb" | sha256sum -c || ynh_die -dpkg -i yarn_1.7.0_all.deb - - # add backports for Debian Jessie (required to install ffmpeg) if [ "$(lsb_release --codename --short)" == "jessie" ]; then echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list - ynh_package_update fi +# add yarn repo for Debian +curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +ynh_package_update # install postgresql, ffmpeg, redis -ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils +ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils yarn #================================================= # DATABASE SETUP diff --git a/scripts/remove b/scripts/remove index 4901b78..889b29c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -47,11 +47,9 @@ fi ynh_remove_app_dependencies ynh_remove_nodejs -# Remove yarn -sudo apt-get remove --purge -y yarn - -# Delete backport from source.list +# Delete backport and yarn from source.list ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list +ynh_secure_remove /etc/apt/sources.list.d/yarn.list #================================================= # REMOVE THE MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index 8928ca3..4e739a7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -79,7 +79,7 @@ ynh_system_user_create "$app" # RESTORE USER RIGHTS #================================================= -# Set right permissions +# Set right permissions datadir="/home/yunohost.app/${app}/storage" chown -R "$app":"$app" "$datadir" @@ -94,20 +94,18 @@ chown -R "$app":"$app" "$datadir" # install nodejs ynh_install_nodejs 8 -# install yarn -wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.7.0/yarn_1.7.0_all.deb -echo "5fecee8378905bbd0c09f9f49d81d427576e3ebdfe9e71ac47eb6c5c5fe35825 yarn_1.7.0_all.deb" | sha256sum -c || ynh_die -dpkg -i yarn_1.7.0_all.deb - - # add backports for Debian Jessie (required to install ffmpeg) if [ "$(lsb_release --codename --short)" == "jessie" ]; then echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list - ynh_package_update fi -# Define and install dependencies -ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils +# add yarn repo for Debian +curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +ynh_package_update + +# install postgresql, ffmpeg, redis +ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils yarn #================================================= # RESTORE THE PostgreSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index a3cdd1c..358b520 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,13 +51,13 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Stop Peertube for upgrade +# Stop Peertube for upgrade systemctl stop "$app" #================================================= # REMOVE APP MAIN DIR #================================================= - + # Create a temporary directory tmpdir="$(mktemp -d)" # Backup the config file in the temp dir @@ -87,19 +87,18 @@ ynh_system_user_create "$app" # install nodejs ynh_install_nodejs 8 -# install yarn -wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.7.0/yarn_1.7.0_all.deb -echo "5fecee8378905bbd0c09f9f49d81d427576e3ebdfe9e71ac47eb6c5c5fe35825 yarn_1.7.0_all.deb" | sha256sum -c || ynh_die -dpkg -i yarn_1.7.0_all.deb - # add backports for Debian Jessie (required to install ffmpeg) if [ "$(lsb_release --codename --short)" == "jessie" ]; then echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list - ynh_package_update fi +# add yarn repo for Debian +curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +ynh_package_update + # install postgresql, ffmpeg, redis -ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils +ynh_install_app_dependencies postgresql ffmpeg redis-server redis-tools mailutils yarn #================================================= # CHECK THE PATH @@ -171,7 +170,7 @@ ynh_use_logrotate --non-append ynh_add_systemd_config -# Set right permissions +# Set right permissions chown -R "$app":"$app" "$final_path" "$datadir"