diff options
| author | Jesús <heckyel@hyperbola.info> | 2022-12-02 01:31:46 +0800 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2022-12-02 01:31:46 +0800 |
| commit | 4167b10dad3e362d4bf70d5e381d77d33d3660ee (patch) | |
| tree | a4f9598d47aa68a778a691c90330a3f269d7ccc4 | |
| parent | 7dbb4185287ef2e8e57126ef19c7ceb0b81307ae (diff) | |
| download | hypervideo-pre-4167b10dad3e362d4bf70d5e381d77d33d3660ee.tar.lz hypervideo-pre-4167b10dad3e362d4bf70d5e381d77d33d3660ee.tar.xz hypervideo-pre-4167b10dad3e362d4bf70d5e381d77d33d3660ee.zip | |
restore get_executable_path to vanilla
| -rw-r--r-- | yt_dlp/utils.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 51d74363b..82d039052 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -5325,9 +5325,14 @@ def make_dir(path, to_screen=None): def get_executable_path(): - from .update import _get_variant_and_executable_path - - return os.path.dirname(os.path.abspath(_get_variant_and_executable_path()[1])) + from zipimport import zipimporter + if hasattr(sys, 'frozen'): # Running from PyInstaller + path = os.path.dirname(sys.executable) + elif isinstance(globals().get('__loader__'), zipimporter): # Running from ZIP + path = os.path.join(os.path.dirname(__file__), '../..') + else: + path = os.path.join(os.path.dirname(__file__), '..') + return os.path.abspath(path) def load_plugins(name, suffix, namespace): |