diff --git a/Applications/Open Media Library.app/Contents/Info.plist b/Applications/Open Media Library.app/Contents/Info.plist index 288d200..f468dbf 100644 --- a/Applications/Open Media Library.app/Contents/Info.plist +++ b/Applications/Open Media Library.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 15D21 + 15C50 CFBundleDevelopmentRegion en CFBundleExecutable @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6 + 0.7 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -31,7 +31,7 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 7C68 + 7C1002 DTPlatformVersion GM DTSDKBuild @@ -39,11 +39,11 @@ DTSDKName macosx10.11 DTXcode - 0720 + 0721 DTXcodeBuild - 7C68 + 7C1002 LSMinimumSystemVersion - 10.11 + 10.10 LSUIElement NSHumanReadableCopyright diff --git a/Applications/Open Media Library.app/Contents/MacOS/Open Media Library b/Applications/Open Media Library.app/Contents/MacOS/Open Media Library index c579dd8..35cb6e2 100755 Binary files a/Applications/Open Media Library.app/Contents/MacOS/Open Media Library and b/Applications/Open Media Library.app/Contents/MacOS/Open Media Library differ diff --git a/Applications/Open Media Library.app/Contents/Resources/Assets.car b/Applications/Open Media Library.app/Contents/Resources/Assets.car index 950959d..fa157ae 100644 Binary files a/Applications/Open Media Library.app/Contents/Resources/Assets.car and b/Applications/Open Media Library.app/Contents/Resources/Assets.car differ diff --git a/Applications/Open Media Library.app/Contents/Resources/install.py b/Applications/Open Media Library.app/Contents/Resources/install.py index 1d5b7cc..57926c5 100755 --- a/Applications/Open Media Library.app/Contents/Resources/install.py +++ b/Applications/Open Media Library.app/Contents/Resources/install.py @@ -20,6 +20,18 @@ def makedirs(dirname): if not os.path.exists(dirname): os.makedirs(dirname) +def get_platform(): + name = sys.platform + if name.startswith('darwin'): + name = 'darwin64' + elif name.startswith('linux'): + import platform + if platform.architecture()[0] == '64bit': + name = 'linux64' + else: + name = 'linux32' + return name + class Handler(SimpleHTTPServer.SimpleHTTPRequestHandler): def do_OPTIONS(self): self.send_response(200, 'OK') @@ -79,17 +91,20 @@ class Install(Thread): release = self.get_release() self.status["release"] = release self.status["progress"] = 0 + platform = get_platform() for module in sorted(release['modules']): - package_tar = release['modules'][module]['name'] - url = self.release_url.replace('release.json', package_tar) - self.download(url, package_tar) + if release['modules'][module].get('platform', platform) == platform: + package_tar = release['modules'][module]['name'] + url = self.release_url.replace('release.json', package_tar) + self.download(url, package_tar) self.status["step"] = 'Installing...' for module in sorted(release['modules']): - package_tar = release['modules'][module]['name'] - tar = tarfile.open(package_tar) - tar.extractall() - tar.close() - os.unlink(package_tar) + if release['modules'][module].get('platform', platform) == platform: + package_tar = release['modules'][module]['name'] + tar = tarfile.open(package_tar) + tar.extractall() + tar.close() + os.unlink(package_tar) os.symlink('openmedialibrary/ctl', 'ctl') makedirs('data') with open('data/release.json', 'w') as fd: diff --git a/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources b/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources index e8b84ef..7c09313 100644 --- a/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources +++ b/Applications/Open Media Library.app/Contents/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ Resources/Assets.car - J0bcbd6bu3teEBZKNEEQTcykNSI= + /nndfnnD+E4e+8Ei7vZtKg7drFI= Resources/Base.lproj/MainMenu.nib @@ -31,7 +31,7 @@ Resources/install.py - 8P8EjUEoWuHCRIRvQTi7vbDhGoM= + O7T+CZEr88aRYb4+kN3/DnjlfN0= Resources/js/install.js @@ -135,7 +135,7 @@ Resources/Assets.car - J0bcbd6bu3teEBZKNEEQTcykNSI= + /nndfnnD+E4e+8Ei7vZtKg7drFI= Resources/Base.lproj/MainMenu.nib @@ -156,7 +156,7 @@ Resources/install.py - 8P8EjUEoWuHCRIRvQTi7vbDhGoM= + O7T+CZEr88aRYb4+kN3/DnjlfN0= Resources/js/install.js