summary refs log tree commit diff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-11-29 15:20:20 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-11-29 15:20:20 +0100
commit20ba04267c3c2be27a766a43f34014012799b761 (patch)
tree73c358079245be1f1b07829d02b5d705d5e0a0a1
parent743b28ce1155df348bbb828fcb316d57c8704328 (diff)
downloadyoutube-dl-20ba04267c3c2be27a766a43f34014012799b761.tar.gz
youtube-dl-20ba04267c3c2be27a766a43f34014012799b761.tar.xz
youtube-dl-20ba04267c3c2be27a766a43f34014012799b761.zip
removed __main__.py from the root of the repo
-rw-r--r--Makefile3
-rwxr-xr-x__main__.py6
2 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c4937a512..2eb226fdb 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/__main__.py b/__main__.py
deleted file mode 100755
index fc3cc8ad8..000000000
--- a/__main__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
-    youtube_dl.main()