Merge remote-tracking branch 'FiloSottille/automation'

diff --cc Makefile
index e2da02e96ba304fec7e76c5fb604ae973cbf34fa,21b34690523cd13e0e5eac6192135659faf92008..625948211d1b12700c0d88a84dae630fd7c20326
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,26 -1,41 +1,48 @@@
- default: update
 -all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
++all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
 +
- update: compile update-readme update-latest
++# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
 +
- update-latest:
-       ./youtube-dl.dev --version > LATEST_VERSION
++clean:
++      rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
  
- update-readme:
-       @options=$$(COLUMNS=80 ./youtube-dl.dev --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/### \1/') && \
-               header=$$(sed -e '/.*## OPTIONS/,$$ d' README.md) && \
-               footer=$$(sed -e '1,/.*## FAQ/ d' README.md) && \
+ PREFIX=/usr/local
+ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
+       install -m 755 --owner root --group root youtube-dl $(PREFIX)/bin/
+       install -m 644 --owner root --group root youtube-dl.1 $(PREFIX)/man/man1
+       install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
+ 
 -.PHONY: all install
++.PHONY: all clean install README.md youtube-dl.bash-completion
++# TODO un-phone README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+ 
+ youtube-dl: youtube_dl/*.py
+       zip --quiet --junk-paths youtube-dl youtube_dl/*.py
+       echo '#!/usr/bin/env python' > youtube-dl
+       cat youtube-dl.zip >> youtube-dl
+       rm youtube-dl.zip
++      chmod a+x youtube-dl
+ 
+ youtube-dl.exe: youtube_dl/*.py
+       bash devscripts/wine-py2exe.sh build_exe.py
+ 
+ README.md: youtube-dl
+       @options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
+               header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
+               footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \
                echo "$${header}" > README.md && \
                echo >> README.md && \
-               echo '## OPTIONS' >> README.md && \
+               echo '# OPTIONS' >> README.md && \
                echo "$${options}" >> README.md&& \
                echo >> README.md && \
-               echo '## FAQ' >> README.md && \
+               echo '# FAQ' >> README.md && \
                echo "$${footer}" >> README.md
  
- compile:
-       zip --quiet --junk-paths youtube-dl youtube_dl/*.py
-       echo '#!/usr/bin/env python' > youtube-dl
-       cat youtube-dl.zip >> youtube-dl
-       rm youtube-dl.zip
+ youtube-dl.1: README.md
+       pandoc -s -w man README.md -o youtube-dl.1
+ 
+ youtube-dl.bash-completion: README.md
+       @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
+               content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
+               echo "$${content}" > youtube-dl.bash-completion
  
- .PHONY: default compile update update-latest update-readme
+ LATEST_VERSION: youtube-dl
+       ./youtube-dl --version > LATEST_VERSION

diff --cc youtube-dl
index 21e604a2581626249f25e4e7bf476d7976b54b06,82d465c464b2fd52283b6d210b9b75542b2f222d..9c78766ffe7b7a9bb44a187192b17c6c678911eb
Binary files differ

diff --cc youtube-dl.exe
index fbed2841adb374f635f305da73d93085f6f43980,b3016aeb678171271710d313df1f739e3187b8c7..0000000000000000000000000000000000000000
deleted file mode 100755,100755
Binary files differ