diff --git a/README.md b/README.md index 236647a..c21a78e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser, using WebTorrent. -**Shipped version:** 4.0.0~ynh2 +**Shipped version:** 4.1.0~ynh1 **Demo:** http://peertube.cpy.re diff --git a/README_fr.md b/README_fr.md index d998376..3f9ec7c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme de streaming vidéo fédérée (ActivityPub) utilisant P2P (BitTorrent) directement dans le navigateur Web, en utilisant WebTorrent -**Version incluse :** 4.0.0~ynh2 +**Version incluse :** 4.1.0~ynh1 **Démo :** http://peertube.cpy.re diff --git a/check_process b/check_process index 68a1f9d..d64a386 100644 --- a/check_process +++ b/check_process @@ -24,6 +24,8 @@ upgrade=1 from_commit=83a06ca4c96ccd941b49647b3698db2c6b771b79 # 4.0.0~ynh1 upgrade=1 from_commit=7c2bb0bb6a91b6b957b734f684aa3d64da892f4c + # 4.0.0~ynh2 + upgrade=1 from_commit=6995b27972e27c6cf8ee3e1f23a2de5cc8c8e8ee backup_restore=1 multi_instance=0 port_already_use=0 @@ -31,16 +33,3 @@ ;;; Options Email=anmol@datamol.org;yalh@yahoo.com Notification=yes -;;; Upgrade options - ; commit=f4b43fd85ad3a169d27c53865a13548e44f17ebf - name=3.2.1~ynh1 - ; commit=08bf3fce3ad99e27e7f7d251838a9f9c63243e44 - name=3.2.1~ynh4 - ; commit=f3bb02002c8fa28748744302475139b6fcf7c651 - name=3.3.0~ynh2 - ; commit=ed59a268e93910f8b35b0f87399f91b8cad9ede0 - name=3.3.0~ynh3 - ; commit=83a06ca4c96ccd941b49647b3698db2c6b771b79 - name=3.4.0~ynh1 - ; commit=7c2bb0bb6a91b6b957b734f684aa3d64da892f4c - name=4.0.0~ynh1 diff --git a/conf/app.src b/conf/app.src index 0f0bceb..a15100e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v4.0.0/peertube-v4.0.0.tar.xz -SOURCE_SUM=afbc6ef1f950cb80fc1b61ef83e27ab25d2c7ec8f605e17bc59f8635848862da +SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v4.1.0/peertube-v4.1.0.tar.xz +SOURCE_SUM=4cdb022edb8087dcf2da3de53b450da396e391fe7976c7bb2d4ee021f2894428 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7235cae..43f5592 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network", "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé" }, - "version": "4.0.0~ynh2", + "version": "4.1.0~ynh1", "url": "https://github.com/Chocobozzz/PeerTube", "upstream": { "license": "AGPL-3.0-only", 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'); } - },