diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-29 18:14:43 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-29 18:14:43 +0100 |
| commit | 3c5b63d2d68d4079285d5ff074e7454ca2df60c6 (patch) | |
| tree | 11bcee1d12e90f7fe835743b616b7f361874210e | |
| parent | 8af4ed7b4fb20190ec72e9ab6347e99deabe9bce (diff) | |
| parent | 20ba04267c3c2be27a766a43f34014012799b761 (diff) | |
| download | youtube-dl-3c5b63d2d68d4079285d5ff074e7454ca2df60c6.tar.gz youtube-dl-3c5b63d2d68d4079285d5ff074e7454ca2df60c6.tar.xz youtube-dl-3c5b63d2d68d4079285d5ff074e7454ca2df60c6.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | __main__.py | 6 |
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() |