diff --git a/osx/par2/par2-sl64 b/osx/par2/par2-sl64 new file mode 100755 index 0000000..074216a Binary files /dev/null and b/osx/par2/par2-sl64 differ diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py index 63617ed..43c78d6 100644 --- a/sabnzbd/__init__.py +++ b/sabnzbd/__init__.py @@ -68,6 +68,7 @@ elif os.name == 'posix': if DARWIN: # 10 = Yosemite, 9 = Mavericks, 8 = MountainLion, 7 = Lion, 6 = SnowLeopard, 5 = Leopard DARWIN_VERSION = int(platform.mac_ver()[0].split('.')[1]) + DARWIN_64 = platform.mac_ver()[2] == 'x86_64' else: DARWIN_VERSION = 0 diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py index f43f0c0..7f4f019 100644 --- a/sabnzbd/newsunpack.py +++ b/sabnzbd/newsunpack.py @@ -99,7 +99,10 @@ def find_programs(curdir): sabnzbd.newsunpack.PAR2C_COMMAND = check(curdir, 'osx/par2/par2-classic') if sabnzbd.DARWIN_VERSION >= 6: #par2-sl from Macpar Deluxe 4.1 is only 10.6 and later - sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'osx/par2/par2-sl') + if sabnzbd.DARWIN_64: + sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'osx/par2/par2-sl64') + else: + sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'osx/par2/par2-sl') else: sabnzbd.newsunpack.PAR2_COMMAND = sabnzbd.newsunpack.PAR2C_COMMAND