path: root/TOOLS/osxbundle
diff options
authorAkemi <>2017-09-29 18:17:32 +0200
committerAkemi <>2017-10-03 11:30:56 +0200
commit77021cf6fe6a1813b832c8927c288e958b6f6845 (patch)
tree85c5e6d0b230337541edb0b05c9fa7465daf5f51 /TOOLS/osxbundle
parent0c04ce5f0d9c4fb7311edf0ae7bdf1eef0f61235 (diff)
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
Diffstat (limited to 'TOOLS/osxbundle')
3 files changed, 2 insertions, 14 deletions
diff --git a/TOOLS/osxbundle/ b/TOOLS/osxbundle/
index 11e34c4548..89ff4bf6ad 100644
--- a/TOOLS/osxbundle/
+++ b/TOOLS/osxbundle/
@@ -173,7 +173,7 @@
- <string></string>
+ <string>mpv-bundle</string>
diff --git a/TOOLS/osxbundle/ b/TOOLS/osxbundle/
deleted file mode 100755
index f84c27a6e2..0000000000
--- a/TOOLS/osxbundle/
+++ /dev/null
@@ -1,13 +0,0 @@
-export MPVBUNDLE="true"
-# set the right args for the user specified standard shell
-# to load the expected profiles and configs
-case "$SHELL" in
- *bash) args="-l $args";;
- *zsh) args="-l -i $args";;
-cd "$(dirname "$0")"
-$SHELL $args "./mpv --player-operation-mode=pseudo-gui"
diff --git a/TOOLS/osxbundle/ b/TOOLS/osxbundle/
new file mode 100644
index 0000000000..bdffa7a951
--- /dev/null
+++ b/TOOLS/osxbundle/
@@ -0,0 +1 @@