Merge branch 'master' of github.com:rg3/youtube-dl

12 years ago · 3c5b63d2d6
parent 8af4ed7b4f 20ba04267c
commit 3c5b63d2d6
2 changed files with 2 additions and 7 deletions
--- a/3
+++ b/3
@ -24,7 +24,8 @@ test:
 # TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them

 youtube-dl: youtube_dl/*.py
-	zip --quiet youtube-dl __main__.py youtube_dl/*.py
+	zip --quiet youtube-dl youtube_dl/*.py
+	zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
 	echo '#!/usr/bin/env python' > youtube-dl
 	cat youtube-dl.zip >> youtube-dl
 	rm youtube-dl.zip
--- a/main.py
+++ b/main.py
@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
-    youtube_dl.main()