diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2011-09-13 23:06:09 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2011-09-13 23:06:09 +0200 |
| commit | ac47cfe3693427e4e3b237b4ae54026b2e3e8ddf (patch) | |
| tree | 3ecb62f26419e92e1c0fe728b140b32a6d96eb58 | |
| parent | 463fe92d26caf6590ded439c7d7ec9352d3d2ca2 (diff) | |
| download | youtube-dl-ac47cfe3693427e4e3b237b4ae54026b2e3e8ddf.tar.gz youtube-dl-ac47cfe3693427e4e3b237b4ae54026b2e3e8ddf.tar.xz youtube-dl-ac47cfe3693427e4e3b237b4ae54026b2e3e8ddf.zip | |
Update generate-download
| -rwxr-xr-x | generate-download | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/generate-download b/generate-download index c5680b8ac..d6d5d42de 100755 --- a/generate-download +++ b/generate-download @@ -1,21 +1,16 @@ #!/usr/bin/env python import hashlib import subprocess -import sys +import os.path -# Run command line and get output -def output(cmdline): - p = subprocess.Popen(cmdline, shell=True, stdout=subprocess.PIPE) - retval = p.communicate()[0] - p.wait() - return retval +youtubeDlDir = os.path.join(os.path.dirname(__file__), '..', 'youtube-dl') # Read template page template = file('download.html.in', 'r').read() # Build replacement strings -version = output('cd ../master && git tag | tail -1').strip() -data = output('cd ../master && git show %s:youtube-dl' % version) +version = subprocess.check_output([os.path.join(youtubeDlDir, 'youtube-dl'), '--version']).strip() +data = subprocess.check_output(['git', 'show', '%s:youtube-dl' % version], cwd=youtubeDlDir) url = 'https://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % version md5sum = hashlib.md5(data).hexdigest() sha1sum = hashlib.sha1(data).hexdigest() |