Moved the syscall to openApplicationAtURL inside Systray

Author: cmaglie

systray/exec_darwin.go

@@ -0,0 +1,60 @@
+package systray
+
+/*
+#cgo CFLAGS: -x objective-c
+#cgo LDFLAGS: -framework Cocoa
+#import <Cocoa/Cocoa.h>
+
+char **makeCharArray(int size) {
+	return calloc(sizeof(char*), size);
+}
+
+void setCharArray(char **a, int n, char *s) {
+	a[n] = s;
+}
+
+void freeCharArray(char **a, int size) {
+	int i;
+	for (i = 0; i < size; i++) {
+		free(a[i]);
+	}
+	free(a);
+}
+
+void runApplication(const char *path, const char **argv, int argc) {
+	NSMutableArray<NSString *> *stringArray = [NSMutableArray array];
+	for (int i=0; i<argc; i++) {
+		NSString *arg = [NSString stringWithCString:argv[i] encoding:NSUTF8StringEncoding];
+		[stringArray addObject:arg];
+	}
+	NSArray<NSString *> *arguments = [NSArray arrayWithArray:stringArray];
+
+	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+	NSURL *url = [NSURL fileURLWithPath:@(path) isDirectory:NO];
+
+	NSWorkspaceOpenConfiguration* configuration = [NSWorkspaceOpenConfiguration new];
+	//[configuration setEnvironment:env];
+	[configuration setPromptsUserIfNeeded:YES];
+	[configuration setCreatesNewApplicationInstance:YES];
+	[configuration setArguments:arguments];
+	dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+	[ws openApplicationAtURL:url configuration:configuration completionHandler:^(NSRunningApplication* app, NSError* error) {
+		dispatch_semaphore_signal(semaphore);
+	}];
+	dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+}
+*/
+import "C"
+
+func execApp(path string, args ...string) error {
+	argc := C.int(len(args))
+	argv := C.makeCharArray(argc)
+	for i, arg := range args {
+		C.setCharArray(argv, C.int(i), C.CString(arg))
+	}
+
+	C.runApplication(C.CString(path), argv, argc)
+
+	C.freeCharArray(argv, argc)
+	return nil
+}

systray/exec_default.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Arduino SA
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+//go:build !darwin
+
+package systray
+
+import "os/exec"
+
+// default execApp from golang
+func execApp(path string, args ...string) error {
+	cmd := exec.Command(path, args...)
+	return cmd.Start()
+}

systray/systray.go

@@ -18,7 +18,6 @@ package systray
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
@@ -69,8 +68,7 @@ func (s *Systray) Restart() {
 	}
 
 	// Launch executable
-	cmd := exec.Command(s.path, args...)
-	err := cmd.Start()
+	err := execApp(s.path, args...)
 	if err != nil {
 		log.Printf("Error restarting process: %v\n", err)
 		return

updater/updater_darwin.go

@@ -15,29 +15,6 @@
 
 package updater
 
-/*
-#cgo CFLAGS: -x objective-c
-#cgo LDFLAGS: -framework Cocoa
-#import <Cocoa/Cocoa.h>
-
-void runApplication(const char *path) {
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
-	NSURL *url = [NSURL fileURLWithPath:@(path) isDirectory:NO];
-
-	NSWorkspaceOpenConfiguration* configuration = [NSWorkspaceOpenConfiguration new];
-	//[configuration setEnvironment:env];
-	[configuration setPromptsUserIfNeeded:YES];
-	[configuration setCreatesNewApplicationInstance:YES];
-
-	dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-	[ws openApplicationAtURL:url configuration:configuration completionHandler:^(NSRunningApplication* app, NSError* error) {
-		dispatch_semaphore_signal(semaphore);
-	}];
-	dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-}
-*/
-import "C"
-
 import (
 	"bytes"
 	"context"
@@ -179,8 +156,7 @@ func checkForUpdates(currentVersion string, updateURL string, cmdName string) (s
 
 	// Restart agent
 	logrus.WithField("path", currentAppPath).Info("Running new app")
-	C.runApplication(C.CString(currentAppPath.String()))
 
 	// Close old agent
-	return "quit", nil
+	return currentAppPath.String(), nil
 }