diff options
author | Philipp Hagemeister <[email protected]> | 2013-09-29 11:17:38 +0200 |
---|---|---|
committer | Philipp Hagemeister <[email protected]> | 2013-09-29 14:37:00 +0200 |
commit | 46353f6783b9e468c9271c864f0711c85d3cea33 (patch) | |
tree | dcbf69a1c66eb1cab3b35ce173e804d24cdb8741 /youtube_dl/update.py | |
parent | 70922df8b589f84e291b25eb5054a753e9eafe27 (diff) | |
download | youtube-dl-46353f6783b9e468c9271c864f0711c85d3cea33.tar.gz youtube-dl-46353f6783b9e468c9271c864f0711c85d3cea33.zip |
[update] Look for .exe extension on Windows (Fixes #745)
Diffstat (limited to 'youtube_dl/update.py')
-rw-r--r-- | youtube_dl/update.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/update.py b/youtube_dl/update.py index ccab6f27f..669b59a68 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -1,6 +1,7 @@ import json import traceback import hashlib +import sys from zipimport import zipimporter from .utils import * @@ -34,7 +35,7 @@ def rsa_verify(message, signature, key): if signature != sha256(message).digest(): return False return True -def update_self(to_screen, verbose, filename): +def update_self(to_screen, verbose): """Update the program file with the latest version from the repository""" UPDATE_URL = "http://rg3.github.io/youtube-dl/update/" @@ -42,7 +43,6 @@ def update_self(to_screen, verbose, filename): JSON_URL = UPDATE_URL + 'versions.json' UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) - if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"): to_screen(u'It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.') return @@ -80,6 +80,12 @@ def update_self(to_screen, verbose, filename): print_notes(to_screen, versions_info['versions']) + filename = sys.argv[0] + # Py2EXE: Filename could be different + if hasattr(sys, "frozen") and not os.path.isfile(filename): + if os.path.isfile(filename + u'.exe'): + filename += u'.exe' + if not os.access(filename, os.W_OK): to_screen(u'ERROR: no write permissions on %s' % filename) return |