diff --git a/osx/unrar/unrar-leopard b/osx/unrar/unrar-ppc similarity index 100% rename from osx/unrar/unrar-leopard rename to osx/unrar/unrar-ppc diff --git a/package.py b/package.py index e68c1c0..d677f1d 100755 --- a/package.py +++ b/package.py @@ -433,11 +433,9 @@ if target == 'app': os.system("mkdir dist/SABnzbd.app/Contents/Resources/osx/unrar>/dev/null") os.system("cp -pR osx/unrar/license.txt dist/SABnzbd.app/Contents/Resources/osx/unrar/ >/dev/null") if OSX_SL: - os.system("cp -pR osx/unrar/unrar-leopard dist/SABnzbd.app/Contents/Resources/osx/unrar/unrar >/dev/null") - os.system("cp -pR osx/7zip/7za-leopard dist/SABnzbd.app/Contents/Resources/osx/7zip/7za >/dev/null") - else: - os.system("cp -pR osx/unrar/unrar dist/SABnzbd.app/Contents/Resources/osx/unrar/ >/dev/null") - os.system("cp -pR osx/7zip/7za dist/SABnzbd.app/Contents/Resources/osx/7zip/ >/dev/null") + os.system("cp -pR osx/unrar/unrar-ppc dist/SABnzbd.app/Contents/Resources/osx/unrar/ >/dev/null") + os.system("cp -pR osx/unrar/unrar dist/SABnzbd.app/Contents/Resources/osx/unrar/ >/dev/null") + os.system("cp -pR osx/7zip/7za dist/SABnzbd.app/Contents/Resources/osx/7zip/ >/dev/null") os.system("cp -pR osx/7zip/License.txt dist/SABnzbd.app/Contents/Resources/osx/7zip/ >/dev/null") os.system("cp icons/sabnzbd.ico dist/SABnzbd.app/Contents/Resources >/dev/null") os.system("pandoc -f markdown -t rtf -s -o dist/SABnzbd.app/Contents/Resources/Credits.rtf README.mkd >/dev/null") diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py index cb1fcf3..a0a7309 100644 --- a/sabnzbd/__init__.py +++ b/sabnzbd/__init__.py @@ -62,7 +62,7 @@ elif os.name == 'posix': FOUNDATION = True except: pass - if platform.machine() == 'i386': + if '86' in platform.machine(): DARWIN_INTEL = True if DARWIN: DARWIN_YS = [int(n) for n in platform.mac_ver()[0].split('.')] >= [10, 9] diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py index 38d0880..11d34b1 100644 --- a/sabnzbd/newsunpack.py +++ b/sabnzbd/newsunpack.py @@ -106,9 +106,11 @@ def find_programs(curdir): except: sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'osx/par2/par2-classic') - sabnzbd.newsunpack.RAR_COMMAND = check(curdir, 'osx/unrar/unrar') if sabnzbd.DARWIN_INTEL: + sabnzbd.newsunpack.RAR_COMMAND = check(curdir, 'osx/unrar/unrar') sabnzbd.newsunpack.SEVEN_COMMAND = check(curdir, 'osx/7zip/7za') + else: + sabnzbd.newsunpack.RAR_COMMAND = check(curdir, 'osx/unrar/unrar-ppc') if sabnzbd.WIN32: if sabnzbd.WIN64 and cfg.allow_64bit_tools.get():