From 189caf4c19afece7e75b5931b31d2b183786cbcf Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 16 Oct 2021 00:28:42 +0200 Subject: [PATCH] packages: network: replace youtube-dl/streamlink with yt-dlp - https://github.com/yt-dlp/yt-dlp - third-party download - fix missing directory creation - formatting - remove unused examples/cleanup commands --- Makefile.extra | 35 +++++++++++++----------- config/package-lists/network.list.chroot | 8 ++---- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Makefile.extra b/Makefile.extra index a1d7020..c5d8abb 100644 --- a/Makefile.extra +++ b/Makefile.extra @@ -8,29 +8,31 @@ clean: rm -rf config/includes.chroot/etc/skel/.nano cache/downloads/nanorc-master.zip rm -rf config/includes.chroot/usr/share/bleachbit/cleaners cache/downloads/cleanerml-master rm -rf config/includes.chroot/etc/firefox-esr/firefox-esr.js cache/downloads/user.js-0.1 + rm -f config/includes.chroot/usr/local/bin/yt-dlp rm -rf config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384} - rm -rf cache/downloads/sublime_text_3 config/includes.chroot/opt/sublime_text rm -f cache/downloads/pidgin-opensteamworks_1.7-buster0-1_amd64.deb rm -f cache/downloads/cleanerml-master.zip - rm -f cache/downloads/lutris_*_all.deb rm -f cache/downloads/user.js-0.1.zip rm -f cache/downloads/xfce4-terminal-colorschemes-1.0.zip + download_extra: clean # Download unpackaged/third-party software # TODO file ITPs on bugs.debian.org, package for Debian mkdir -p cache/downloads/ - # https://github.com/scopatz/nanorc + + # EXTRA https://github.com/scopatz/nanorc $(WGET) https://github.com/scopatz/nanorc/archive/master.zip -O cache/downloads/nanorc-master.zip unzip -q cache/downloads/nanorc-master.zip -d cache/downloads/ mv cache/downloads/nanorc-master config/includes.chroot/etc/skel/.nano - git checkout -- config/includes.chroot/etc/skel/.nanorc - # https://github.com/az0/cleanerml + + # EXTRA https://github.com/az0/cleanerml $(WGET) https://github.com/az0/cleanerml/archive/master.zip -O cache/downloads/cleanerml-master.zip unzip -q cache/downloads/cleanerml-master.zip -d cache/downloads/ mkdir -p config/includes.chroot/usr/share/bleachbit/cleaners mv cache/downloads/cleanerml-master/release/* config/includes.chroot/usr/share/bleachbit/cleaners/ - # https://github.com/nodiscc/user.js + + # EXTRA https://github.com/nodiscc/user.js $(WGET) https://github.com/nodiscc/user.js/archive/0.1.zip -O cache/downloads/user.js-0.1.zip unzip -q cache/downloads/user.js-0.1.zip -d cache/downloads/ mkdir -p config/includes.chroot/etc/firefox-esr @@ -39,17 +41,18 @@ download_extra: clean # https://github.com/EionRobb/pidgin-opensteamworks/ -mkdir -p config/packages.chroot $(WGET) https://gitlab.com/nodiscc/pidgin-opensteamworks/-/jobs/471942010/artifacts/raw/pidgin-opensteamworks_1.7-buster0-1_amd64.deb - # https://lutris.net/downloads/ - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754129 - $(WGET) https://download.opensuse.org/repositories/home:/strycore/Debian_10/all/lutris_0.5.8.4_all.deb - # https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/ - # https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/ + + # EXTRA https://github.com/yt-dlp/yt-dlp + $(WGET) https://github.com/yt-dlp/yt-dlp/releases/download/2021.09.25/yt-dlp + chmod a+x config/packages.chroot + mkdir -p config/includes.chroot/usr/local/bin/ + mv cache/downloads/yt-dlp config/includes.chroot/usr/local/bin/ + + # EXTRA https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/ + # EXTRA https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/ mkdir -p config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384} $(WGET) https://addons.mozilla.org/firefox/downloads/file/3465157/keepassxc_browser-latest-fx.xpi -O config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/keepassxc-browser@keepassxc.org.xpi $(WGET) https://addons.mozilla.org/firefox/downloads/file/3530747/cookie_autodelete-3.1.1-an+fx.xpi -O config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/CookieAutoDelete@kennydo.com.xpi - # https://www.sublimetext.com/ (non-free) - #$(WGET) https://download.sublimetext.com/sublime_text_3_build_3211_x64.tar.bz2 - #tar -C cache/downloads -xvf cache/downloads/sublime_text_3_build_3211_x64.tar.bz2 - #mkdir -p config/includes.chroot/opt - #mv cache/downloads/sublime_text_3 config/includes.chroot/opt/sublime_text - # https://github.com/ars3niy/tdlib-purple + + # EXTRA (DISABLED) https://github.com/ars3niy/tdlib-purple #$(WGET) https://download.opensuse.org/repositories/home:/ars3n1y/Debian_10/amd64/libpurple-telegram-tdlib_0.7.1-1_amd64.deb diff --git a/config/package-lists/network.list.chroot b/config/package-lists/network.list.chroot index e723e36..1517bdd 100644 --- a/config/package-lists/network.list.chroot +++ b/config/package-lists/network.list.chroot @@ -108,11 +108,9 @@ transmission-cli #Alt: btfs #Section: Media download -#Description: youtube-dl -youtube-dl -streamlink -#Alt: get-flash-videos -#Alt: gnome-twitch +##Description: youtube-dl +#Alt: youtube-dl +#Alt: streamlink #Alt: minitube #Alt: smtube