fix for mac + cleanup

.github/workflows/release.yml

@@ -6,25 +6,29 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        platform: [
+          { runner: windows-latest, exe: lunar-launcher-inject-windows.exe },
+          { runner: macos-latest, exe: lunar-launcher-inject-mac },
+          { runner: ubuntu-latest, exe: lunar-launcher-inject-linux }
+        ]
+    runs-on: ${{ matrix.platform.runner }}
     steps:
     - uses: actions/checkout@v3
 
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.19
+        go-version: '1.20'
 
     - name: Build
-      run: |
-        mkdir build && cd build
-        for target in windows,-windows.exe darwin,-macos linux,-linux
-        do
-          IFS=, read -r os suffix <<< ${target}
-          GOOS=${os} GOARCH=amd64 go build -v -o lunar-launcher-inject${suffix} ..
-        done
+      run: GOARCH=amd64 go build -v -o ${{ matrix.platform.exe }} -ldflags "-s -w"
 
-    - name: Upload Artifacts
-      run: gh release upload ${GITHUB_REF_NAME} build/*
+    - name: Upload Executable
+      run: gh release upload ${GITHUB_REF_NAME} ${{ matrix.platform.exe }}
       env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

chrome_debugger.go

@@ -73,7 +73,6 @@ func GetWebsocketDebuggerUrl(port int) (string, error) {
 			if err != nil {
 				return err
 			}
-
 			defer r.Body.Close()
 
 			body, err := io.ReadAll(r.Body)

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "embed"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -22,7 +23,7 @@ func GetLunarExecutable() (string, error) {
 				return "", err
 			}
 			exe = home + `\AppData\Local\Programs\lunarclient\Lunar Client.exe`
-		case "macos":
+		case "darwin":
 			exe = "/Applications/Lunar Client.app/Contents/MacOS/Lunar Client"
 		case "linux":
 			exe = "/usr/bin/lunarclient"
@@ -31,35 +32,36 @@ func GetLunarExecutable() (string, error) {
 		}
 	}
 
-	if _, err := os.Stat(exe); err == nil {
-		return exe, nil
+	if _, err := os.Stat(exe); errors.Is(err, os.ErrNotExist) {
+		return "", fmt.Errorf("'%s' does not exist", exe)
 	}
 
-	return "", fmt.Errorf("'%s' does not exist", exe)
+	return exe, nil
 }
 
 func Run() (err error) {
 	lunarExe, err := GetLunarExecutable()
 	if err != nil {
-		return fmt.Errorf("%w\nfailed to locate the lunar launcher executable, try passing it by argument", err)
+		if len(os.Args) < 2 {
+			return fmt.Errorf("failed to locate the lunar launcher executable, try passing it by argument: %w", err)
+		}
+		return err
 	}
 
 	d, cmd, err := StartProcessAndConnectDebugger(lunarExe)
-	if cmd != nil {
-		defer func() {
-			if err != nil {
-				_ = cmd.Process.Kill()
-			}
-		}()
-	}
+	defer func() {
+		if cmd != nil && err != nil {
+			_ = cmd.Process.Kill()
+		}
+	}()
 	if err != nil {
-		return
+		return err
 	}
 	defer d.Close()
 
 	ex, err := os.Executable()
 	if err != nil {
-		return
+		return err
 	}
 
 	return d.Send("Runtime.callFunctionOn", map[string]any{