Detect Docker socket in new user location.

Author: blaise-io

Ace Link/AppDelegate.swift

@@ -26,9 +26,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func application(_: NSApplication, open urls: [URL]) {
-		if Process.runCommand("docker", "--version").terminationStatus != 0 {
-			return
-		}
+        if Process.runCommand("docker", "--version").terminationStatus != 0 {
+            return
+        }
         if let url = urls.first, let stream = ExtractStream.from(applicationURL: url) {
             openStream(stream)
         } else {

Ace Link/Extensions/Process.swift

@@ -16,16 +16,33 @@ extension Process {
         set { standardErrorMap.setObject(NSString(string: newValue), forKey: self) }
     }
 
+    var userDockerSocket: String? {
+        let home = FileManager.default.homeDirectoryForCurrentUser
+        let userSocketPath = home.path + "/.docker/run/docker.sock"
+        if FileManager.default.fileExists(atPath: userSocketPath) {
+            return userSocketPath
+        }
+        return nil
+    }
+
     static func runCommand(_ arguments: String...) -> Self {
         let process = Self()
 
         process.launchPath = "/usr/bin/env"
         process.arguments = arguments
         process.environment = [
+            // Modify PATH to include dirs containing local binaries.
             "PATH": ProcessInfo.processInfo.environment["PATH"]! + ":/usr/local/bin:/opt/local/bin",
+            // Don't attempt to download/run arm64 packages because they're not supported.
             "DOCKER_DEFAULT_PLATFORM": "linux/amd64",
         ]
 
+        // Docker-for-Mac allows both /Users/<user>/.docker/run/docker.sock (new)
+        // and /var/run/docker.sock (legacy but supported).
+        if let userDockerSocket = process.userDockerSocket {
+            process.environment?["DOCKER_HOST"] = "unix://" + userDockerSocket
+        }
+
         os_log("Running command: %{public}@", arguments.joined(separator: " ").scrubHashes())
 
         let outputPipe = Pipe(), errorPipe = Pipe()

Ace Link/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.5</string>
+	<string>2.0.6</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Ace Link/Menu/SelectPlayerMenu.swift

@@ -71,8 +71,10 @@ class SelectPlayerMenu: PartialMenu {
     private func warnCapabilities(bundle: Bundle) {
         if bundle.supports(fileExtension: "mkv") {
             // Players that support mkv will likely play anything you throw at it.
-            // Typically we need h264, ac3, adts and ts support, however streams could use any codec.
-            // Browsers are unable to play the adts audio codec, which is relatively popular in streams.
+            // Typically we need h264, ac3, adts and ts support, however streams could use any
+            // codec.
+            // Browsers are unable to play the adts audio codec, which is relatively popular in
+            // streams.
             return
         }
 

README.md

@@ -4,7 +4,7 @@ Ace Link is a menu bar app that allows playing Ace Streams on macOS.
 
 Play an Ace Stream or Magnet in any media player by pasting the URL in the Ace Link menu, or open an acestream or magnet link in Ace Link.
 
-## [Download for macOS](https://github.com/blaise-io/acelink/releases/download/2.0.5/Ace.Link.2.0.5.dmg)
+## [Download for macOS](https://github.com/blaise-io/acelink/releases/download/2.0.6/Ace.Link.2.0.6.dmg)
 
  - Install using HomeBrew: `brew install --cask ace-link`
  - [Download an older version](https://github.com/blaise-io/acelink/releases)

VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6