From 71149a6232ba84c524886e8d21654bf542f145c9 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Wed, 30 Jan 2019 23:23:04 -0500 Subject: [PATCH] Fix to use OS unrar in path before those included with Bazarr. --- bazarr/init.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bazarr/init.py b/bazarr/init.py index 44f688a55..927eb98c0 100644 --- a/bazarr/init.py +++ b/bazarr/init.py @@ -153,17 +153,18 @@ def init_binaries(): unrar_exe = None exe = None - if platform.system() == "Windows": # Windows - unrar_exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", "UnRAR", "UnRAR.exe")) - elif platform.system() == "Darwin": # MacOSX - unrar_exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", "UnRAR", "unrar")) + if os.path.isfile("unrar"): + unrar_exe = "unrar" + else: + if platform.system() == "Windows": # Windows + unrar_exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", "UnRAR", "UnRAR.exe")) - elif platform.system() == "Linux": # Linux - unrar_exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), "UnRAR", "unrar")) + elif platform.system() == "Darwin": # MacOSX + unrar_exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", "UnRAR", "unrar")) - else: - unrar_exe = "unrar" + elif platform.system() == "Linux": # Linux + unrar_exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), "UnRAR", "unrar")) if unrar_exe and os.path.isfile(unrar_exe): exe = unrar_exe