Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- src/youtube-dl/Makefile.orig 2020-10-24 08:37:09.765849785 -0400
- +++ src/youtube-dl/Makefile 2020-10-24 13:41:17.420533243 -0400
- @@ -14,8 +14,8 @@
- # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
- SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
- -# set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
- -MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
- +## set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
- +#MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
- install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
- install -d $(DESTDIR)$(BINDIR)
- @@ -89,11 +89,11 @@
- $(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
- README.txt: README.md
- - pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
- + markdown README.md | html2text > README.txt
- youtube-dl.1: README.md
- $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
- - pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
- + marked-man youtube-dl.1.temp.md > youtube-dl.1
- rm -f youtube-dl.1.temp.md
- youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
- --- src/youtube-dl/devscripts/release.sh.orig 2020-10-24 08:37:09.769183108 -0400
- +++ src/youtube-dl/devscripts/release.sh 2020-10-24 12:53:11.894893478 -0400
- @@ -56,7 +56,9 @@
- useless_files=$(find youtube_dl -type f -not -name '*.py')
- if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; exit 1; fi
- if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
- -if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
- +if ! type markdown >/dev/null 2>/dev/null; then echo 'ERROR: markdown/discount is missing'; exit 1; fi
- +if ! type html2text >/dev/null 2>/dev/null; then echo 'ERROR: html2text/python-html2text is missing'; exit 1; fi
- +if ! type marked-man >/dev/null 2>/dev/null; then echo 'ERROR: marked-man is missing'; exit 1; fi
- if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
- if ! python3 -c 'import wheel' 2>/dev/null; then echo 'ERROR: wheel is missing'; exit 1; fi
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement