mac/app: add option to adjust Bundle PATH variable

App Bundles operate in their own shell environment that is different from the one in the terminal. the default PATH variable for all Bundles is /usr/bin:/bin:/usr/sbin:/sbin. because of that mpv can not find binaries installed by package manager that might be used in scripts for example. add an option to prepend paths to the Bundle PATH. we prepend to make the order fully configurable, opposed to appending where the default Bundle binaries would always take precedence.

der richter committed 2 years ago

Commit 61a09501 parent c0fb6d06 files · +41 −10Browse files

Unified · Split

6 files

DOCS/man/options.rst +15 −0
osdep/mac/app_bridge.h +1 −0
osdep/mac/app_bridge.m +5 −0
osdep/mac/app_hub.swift +7 −0
osdep/mac/application.swift +2 −10
osdep/mac/type_helper.swift +11 −0

DOCS/man/options.rst+15−0

@@ -6601,6 +6601,21 @@ them. · 6600 unmodified lines
6601	precedence over any other shortcuts, they are not propagated to the mpv core and they can't be	6601	precedence over any other shortcuts, they are not propagated to the mpv core and they can't be
6602	used in config files like ``input.conf`` or script bindings.	6602	used in config files like ``input.conf`` or script bindings.
6603		6603
		6604	``--macos-bundle-path=path1,path2,...``
		6605	App Bundles operate in their own shell environment that is different from the one in the
		6606	terminal. The default PATH variable for all Bundles is ``/usr/bin:/bin:/usr/sbin:/sbin``.
		6607	Because of that mpv can not find binaries installed by package manager that might be used in
		6608	scripts for example. This option prepends all given paths to the default Bundle PATH.
		6609
		6610	Default value in following order:
		6611
		6612	:/usr/local/bin: homebrew (Intel) install path
		6613	:/usr/local/sbin: homebrew (Intel) install path
		6614	:/opt/local/bin: MacPorts install path
		6615	:/opt/local/sbin: MacPorts install path
		6616	:/opt/homebrew/bin: homebrew (ARM) install path
		6617	:/opt/homebrew/sbin: homebrew (ARM) install path
		6618
6604	``--android-surface-size=<WxH>``	6619	``--android-surface-size=<WxH>``
6605	Set dimensions of the rendering surface used by the Android gpu context.	6620	Set dimensions of the rendering surface used by the Android gpu context.
6606	Needs to be set by the embedding application if the dimensions change during	6621	Needs to be set by the embedding application if the dimensions change during

osdep/mac/app_bridge.h+1−0

@@ -63,6 +63,7 @@ struct macos_opts { · 62 unmodified lines
63	int macos_geometry_calculation;	63	int macos_geometry_calculation;
64	int macos_render_timer;	64	int macos_render_timer;
65	bool macos_menu_shortcuts;	65	bool macos_menu_shortcuts;
		66	char **macos_bundle_path;
66	int cocoa_cb_sw_renderer;	67	int cocoa_cb_sw_renderer;
67	bool cocoa_cb_10bit_context;	68	bool cocoa_cb_10bit_context;
68	int cocoa_cb_output_csp;	69	int cocoa_cb_output_csp;

osdep/mac/app_bridge.m+5−0

             {"callback", RENDER_TIMER_CALLBACK}, {"precise", RENDER_TIMER_PRECISE},
             {"system", RENDER_TIMER_SYSTEM}, {"feedback", RENDER_TIMER_PRESENTATION_FEEDBACK})},
         {"macos-menu-shortcuts", OPT_BOOL(macos_menu_shortcuts)},
+        {"macos-bundle-path", OPT_STRINGLIST(macos_bundle_path)},
         {"cocoa-cb-sw-renderer", OPT_CHOICE(cocoa_cb_sw_renderer,
             {"auto", -1}, {"no", 0}, {"yes", 1})},
         {"cocoa-cb-10bit-context", OPT_BOOL(cocoa_cb_10bit_context)},
         .macos_fs_animation_duration = -1,
         .macos_render_timer = RENDER_TIMER_CALLBACK,
         .macos_menu_shortcuts = true,
+        .macos_bundle_path = (char *[]){
+            "/usr/local/bin", "/usr/local/sbin", "/opt/local/bin", "/opt/local/sbin",
+            "/opt/homebrew/bin", "/opt/homebrew/sbin", NULL
+        },
         .cocoa_cb_sw_renderer = -1,
         .cocoa_cb_10bit_context = true,
         .cocoa_cb_output_csp = MAC_CSP_AUTO,

osdep/mac/app_hub.swift+7−0

     let MPV_PROTOCOL: String = "mpv://"
     var isApplication: Bool { return NSApp is Application }
+    var isBundle: Bool { return ProcessInfo.processInfo.environment["MPVBUNDLE"] == "true" }
     var openEvents: Int = 0
     private override init() {
             input.option = option
             DispatchQueue.main.sync { menu = MenuBar(self) }
         }
+        if let bundlePath = option?.mac.macos_bundle_path, isBundle {
+            let path = TypeHelper.toStringArray(bundlePath).joined(separator: ":") + ":" +
+                (ProcessInfo.processInfo.environment["PATH"] ?? "")
+            log.verbose("Setting Bundle PATH to: \(path)")
+            _ = path.withCString { setenv("PATH", $0, 1) }
+        }
 #if HAVE_MACOS_MEDIA_PLAYER
         remote?.registerEvents()

osdep/mac/application.swift+2−10

 class Application: NSApplication, NSApplicationDelegate {
     var appHub: AppHub { return AppHub.shared }
     var eventManager: NSAppleEventManager { return NSAppleEventManager.shared() }
-    var isBundle: Bool { return ProcessInfo.processInfo.environment["MPVBUNDLE"] == "true" }
     var playbackThreadId: mp_thread!
     var argc: Int32?
     var argv: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?
     }
     func setupBundle() {
-        if !isBundle { return }
+        if !appHub.isBundle { return }
         // started from finder the first argument after the binary may start with -psn_
         if CommandLine.argc > 1 && CommandLine.arguments[1].hasPrefix("-psn_") {
             argc? = 1
             argv?[1] = nil
         }
-        let path = (ProcessInfo.processInfo.environment["PATH"] ?? "") +
-            ":/usr/local/bin:/usr/local/sbin" + // homebrew Intel
-            ":/opt/local/bin:/opt/local/sbin" + // MacPorts
-            ":/opt/homebrew/bin:/opt/homebrew/sbin" // homebrew ARM
-        appHub.log.verbose("Setting Bundle $PATH to: \(path)")
-        _ = path.withCString { setenv("PATH", $0, 1) }
     }
     let playbackThread: @convention(c) (UnsafeMutableRawPointer) -> UnsafeMutableRawPointer? = { (ptr: UnsafeMutableRawPointer) in
         NSApp = self
         NSApp.delegate = self
-        NSApp.setActivationPolicy(isBundle ? .regular : .accessory)
+        NSApp.setActivationPolicy(appHub.isBundle ? .regular : .accessory)
         setupBundle()
         pthread_create(&playbackThreadId, nil, playbackThread, TypeHelper.bridge(obj: self))
         appHub.input.wait()

osdep/mac/type_helper.swift+11−0

@@ -50,6 +50,17 @@ class TypeHelper { · 49 unmodified lines
50	}	50	}
51	}	51	}
52		52
		53	// char ** OPT_STRINGLIST
		54	class func toStringArray(_ obj: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?) -> [String] {
		55	guard var cStringArray = obj else { return [] }
		56	var stringArray: [String] = []
		57	while let cString = cStringArray.pointee {
		58	stringArray.append(String(cString: cString))
		59	cStringArray += 1
		60	}
		61	return stringArray
		62	}
		63
53	// (char *) MPV_FORMAT_STRING	64	// (char *) MPV_FORMAT_STRING
54	class func toString(_ obj: UnsafeMutableRawPointer?) -> String? {	65	class func toString(_ obj: UnsafeMutableRawPointer?) -> String? {
55	guard let str = obj else { return nil }	66	guard let str = obj else { return nil }

mac/app: add option to adjust Bundle PATH variable

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code