From 3ed9cf0204a988dc76aa6105ddb559d3f0566aaa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 11:09:11 +0100 Subject: [PATCH 1/2] Removing ffmpeg for Jessie --- scripts/install | 7 ------- scripts/upgrade | 7 ------- 2 files changed, 14 deletions(-) diff --git a/scripts/install b/scripts/install index 451ddca..de9724e 100644 --- a/scripts/install +++ b/scripts/install @@ -87,13 +87,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index c316c2a..39828ae 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -195,13 +195,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" From fd83745f77e887aca7c427de97a557d1af2359af Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 11 Dec 2021 16:12:22 +0100 Subject: [PATCH 2/2] Remove jessie code to install ffmpeg --- scripts/restore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index a35e20e..e5e4756 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,13 +98,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"