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/mpv.app/Contents/Info.plist | 2 +- TOOLS/osxbundle/mpv.app/Contents/MacOS/mpv-wrapper.sh | 13 ------------- TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf | 1 + 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 TOOLS/osxbundle/mpv.app/Contents/MacOS/mpv-wrapper.sh create mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf (limited to 'TOOLS/osxbundle') diff --git a/TOOLS/osxbundle/mpv.app/Contents/Info.plist b/TOOLS/osxbundle/mpv.app/Contents/Info.plist index 11e34c4548..89ff4bf6ad 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Info.plist +++ b/TOOLS/osxbundle/mpv.app/Contents/Info.plist @@ -173,7 +173,7 @@ CFBundleExecutable - mpv-wrapper.sh + mpv-bundle CFBundleIconFile icon CFBundleIdentifier diff --git a/TOOLS/osxbundle/mpv.app/Contents/MacOS/mpv-wrapper.sh b/TOOLS/osxbundle/mpv.app/Contents/MacOS/mpv-wrapper.sh deleted file mode 100755 index f84c27a6e2..0000000000 --- a/TOOLS/osxbundle/mpv.app/Contents/MacOS/mpv-wrapper.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -export MPVBUNDLE="true" - -# set the right args for the user specified standard shell -# to load the expected profiles and configs -args="-c" -case "$SHELL" in - *bash) args="-l $args";; - *zsh) args="-l -i $args";; -esac - -cd "$(dirname "$0")" -$SHELL $args "./mpv --player-operation-mode=pseudo-gui" diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf new file mode 100644 index 0000000000..bdffa7a951 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf @@ -0,0 +1 @@ +player-operation-mode=pseudo-gui -- cgit v1.2.3