mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-08-14 16:38:29 +00:00
[update] fix onedir variant names
Authored by: bashonly
This commit is contained in:
parent
87722b6cc8
commit
aa0d28531a
@ -61,10 +61,10 @@ def _get_variant_and_executable_path():
|
|||||||
# py2exe is unsupported but we should still correctly identify it for debugging purposes
|
# py2exe is unsupported but we should still correctly identify it for debugging purposes
|
||||||
if not hasattr(sys, '_MEIPASS'):
|
if not hasattr(sys, '_MEIPASS'):
|
||||||
return 'py2exe', path
|
return 'py2exe', path
|
||||||
if sys._MEIPASS == os.path.dirname(path):
|
# We know it's a PyInstaller bundle, but is it "onedir" or "onefile"?
|
||||||
return f'{sys.platform}_dir', path
|
suffix = 'dir' if sys._MEIPASS == os.path.dirname(path) else 'exe'
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
return 'darwin_exe', path
|
return f'darwin_{suffix}', path
|
||||||
|
|
||||||
machine = f'_{platform.machine().lower()}'
|
machine = f'_{platform.machine().lower()}'
|
||||||
is_64bits = sys.maxsize > 2**32
|
is_64bits = sys.maxsize > 2**32
|
||||||
@ -80,7 +80,7 @@ def _get_variant_and_executable_path():
|
|||||||
if static_exe_path := os.getenv('STATICX_PROG_PATH'):
|
if static_exe_path := os.getenv('STATICX_PROG_PATH'):
|
||||||
path = static_exe_path
|
path = static_exe_path
|
||||||
|
|
||||||
return f'{remove_end(sys.platform, "32")}{machine}_exe', path
|
return f'{remove_end(sys.platform, "32")}{machine}_{suffix}', path
|
||||||
|
|
||||||
path = os.path.dirname(__file__)
|
path = os.path.dirname(__file__)
|
||||||
if isinstance(__loader__, zipimporter):
|
if isinstance(__loader__, zipimporter):
|
||||||
|
Loading…
Reference in New Issue
Block a user