From 1f64101d6c1391fb8a49c26af2323bb856878bb5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Feb 2022 19:55:29 +0100 Subject: [PATCH] remove patches-4.0.0 --- scripts/install | 1 - scripts/upgrade | 1 - .../patches-4.0.0/app-python-in-config.patch | 26 ------------------- 3 files changed, 28 deletions(-) delete mode 100644 sources/patches-4.0.0/app-python-in-config.patch diff --git a/scripts/install b/scripts/install index c0e23e8..cae6d2c 100644 --- a/scripts/install +++ b/scripts/install @@ -140,7 +140,6 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -[ -d "../sources/patches-$(ynh_app_upstream_version)" ] && cp -a "../sources/patches-$(ynh_app_upstream_version)" "../sources/patches" ynh_setup_source --dest_dir="$final_path" chmod 750 "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 83b35b5..b55b0fa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,7 +178,6 @@ then ynh_secure_remove --file="$final_path" # Download, check integrity, uncompress and patch the source from app.src - [ -d "../sources/patches-$(ynh_app_upstream_version)" ] && cp -a "../sources/patches-$(ynh_app_upstream_version)" "../sources/patches" ynh_setup_source --dest_dir="$final_path" #Copy the admin saved settings from tmp directory to final path diff --git a/sources/patches-4.0.0/app-python-in-config.patch b/sources/patches-4.0.0/app-python-in-config.patch deleted file mode 100644 index 6a2633c..0000000 --- a/sources/patches-4.0.0/app-python-in-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff '--color=auto' -ru ./dist/server/helpers/youtube-dl/youtube-dl-cli.js ./dist/server/helpers/youtube-dl/youtube-dl-cli.js ---- ./dist/server/helpers/youtube-dl/youtube-dl-cli.js 2021-12-13 09:22:44.000000000 +0100 -+++ ./dist/server/helpers/youtube-dl/youtube-dl-cli.js 2022-01-11 22:35:52.992330841 +0100 -@@ -104,7 +104,8 @@ - let completeArgs = this.wrapWithProxyOptions(args); - completeArgs = this.wrapWithIPOptions(completeArgs); - completeArgs = this.wrapWithFFmpegOptions(completeArgs); -- const output = yield (0, execa_1.default)('python', [youtubeDLBinaryPath, ...completeArgs, url], processOptions); -+ const { PYTHON_PATH } = config_1.CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE; -+ const output = yield (0, execa_1.default)(PYTHON_PATH, [youtubeDLBinaryPath, ...completeArgs, url], processOptions); - logger_1.logger.debug('Runned youtube-dl command.', Object.assign({ command: output.command }, lTags())); - return output.stdout - ? output.stdout.trim().split(/\r?\n/) -diff '--color=auto' -ru ./dist/server/initializers/config.js ./dist/server/initializers/config.js ---- ./dist/server/initializers/config.js 2021-12-13 09:22:43.000000000 +0100 -+++ ./dist/server/initializers/config.js 2022-01-11 22:35:51.812344562 +0100 -@@ -295,7 +295,8 @@ - get ENABLED() { return config.get('import.videos.http.enabled'); }, - YOUTUBE_DL_RELEASE: { - get URL() { return config.get('import.videos.http.youtube_dl_release.url'); }, -- get NAME() { return config.get('import.videos.http.youtube_dl_release.name'); } -+ get NAME() { return config.get('import.videos.http.youtube_dl_release.name'); }, -+ get PYTHON_PATH() { return config.get('import.videos.http.youtube_dl_release.python_path'); } - }, - get FORCE_IPV4() { return config.get('import.videos.http.force_ipv4'); } - },