From 77021cf6fe6a1813b832c8927c288e958b6f6845 Mon Sep 17 00:00:00 2001 From: Akemi Date: Fri, 29 Sep 2017 18:17:32 +0200 Subject: osx: fix bundle on macOS High Sierra (10.13) Apple slightly changed the App bundle mechanism which broke wrapper scripts that invoke the actual binary. it caused the bundle to always open a new instance of mpv instead of reusing the currently running one. just removing the wrapper script would lead to several regressions, so it was replaced with a symlink to the bundle binary. detection if mpv was started from the bundle was replaced by comparing the execution name of the binary, eg the name of the symlink "mpv-bundle". additionally, because we load a standard config from the Resources folder of the bundle again, we prevent that config from being loaded if mpv wasn't started via the bundle. the psn argument has to be removed manually again. the ability of loading your standard shell environment has been removed with the wrapper. a substitution will be added with another commit. as a side effect this fixes an issues when zsh was used with common NodeJS configuration scripts. Fixes #4926 #4866 --- TOOLS/osxbundle.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'TOOLS/osxbundle.py') diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py index e9ef8bc4de..ba0efd9e7e 100755 --- a/TOOLS/osxbundle.py +++ b/TOOLS/osxbundle.py @@ -39,6 +39,10 @@ def apply_plist_template(plist_file, version): for line in fileinput.input(plist_file, inplace=1): print (line.rstrip().replace('${VERSION}', version)) +def create_bundle_symlink(binary_name, symlink_name): + os.symlink(os.path.basename(binary_name), + os.path.join(target_directory(binary_name), symlink_name)) + def bundle_version(): if os.path.exists('VERSION'): x = open('VERSION') @@ -69,6 +73,8 @@ def main(): copy_bundle(binary_name) print("> copying binary") copy_binary(binary_name) + print("> create bundle symlink") + create_bundle_symlink(binary_name, "mpv-bundle") print("> generating Info.plist") apply_plist_template(target_plist(binary_name), version) -- cgit v1.2.3