From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 22 May 2016 04:06:45 +0000 (+0600)
Subject: [update] Fix youtube-dl.exe updating from arbitrary directory (Closes #2718)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e9297256d405651428d5d52f0bb6b32ca66ea15a;p=youtube-dl

[update] Fix youtube-dl.exe updating from arbitrary directory (Closes #2718)
---

diff --git a/youtube_dl/update.py b/youtube_dl/update.py
index 676ebe1c4..ebce9666a 100644
--- a/youtube_dl/update.py
+++ b/youtube_dl/update.py
@@ -83,11 +83,8 @@ def update_self(to_screen, verbose, opener):
 
     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 + '.exe'):
-            filename += '.exe'
+    # sys.executable is set to the full pathname of the exe-file for py2exe
+    filename = sys.executable if hasattr(sys, 'frozen') else sys.argv[0]
 
     if not os.access(filename, os.W_OK):
         to_screen('ERROR: no write permissions on %s' % filename)
@@ -95,7 +92,7 @@ def update_self(to_screen, verbose, opener):
 
     # Py2EXE
     if hasattr(sys, 'frozen'):
-        exe = os.path.abspath(filename)
+        exe = filename
         directory = os.path.dirname(exe)
         if not os.access(directory, os.W_OK):
             to_screen('ERROR: no write permissions on %s' % directory)