fix merge issue

qpep-tray/common/configuration.go

@@ -3,9 +3,9 @@ package common
 import (
 	"context"
 	"fmt"
+	"github.com/Project-Faster/qpep/qpep-tray/notify"
 	"github.com/Project-Faster/qpep/shared/configuration"
 	"github.com/Project-Faster/qpep/shared/logger"
-	"github.com/Project-Faster/qpep/qpep-tray/notify"
 	"os"
 	"time"
 
@@ -22,7 +22,7 @@ func openConfigurationWithOSEditor() {
 }
 
 func openLogsFolder() {
-	_, _, _, logsPath := shared.GetConfigurationPaths()
+	_, _, _, logsPath := configuration.GetConfigurationPaths()
 
 	if err := open.Run(logsPath); err != nil {
 		notify.ErrorMsg("Editor configuration failed with error: %v", err)

qpep-tray/common/impl_darwin.go

@@ -1,10 +1,9 @@
 package common
 
 import (
-	"github.com/Project-Faster/qpep/shared/logger"
-	"github.com/Project-Faster/qpep/shared/configuration"
 	"github.com/Project-Faster/qpep/qpep-tray/icons"
 	"github.com/Project-Faster/qpep/qpep-tray/notify"
+	"github.com/Project-Faster/qpep/shared/configuration"
 	"os/exec"
 	"path/filepath"
 )
@@ -19,8 +18,8 @@ func getServiceCommand(start, client bool) *exec.Cmd {
 	exeFile, _ := filepath.Abs(filepath.Join(ExeDir, EXENAME))
 
 	var serviceFlag = "start"
-	var clientFlag = "--client"
-	var verboseFlag = "--verbose"
+	var clientFlag = "-client"
+	var verboseFlag = "-verbose"
 	if !start {
 		serviceFlag = "stop"
 	}
@@ -31,16 +30,12 @@ func getServiceCommand(start, client bool) *exec.Cmd {
 		verboseFlag = ""
 	}
 
-	cmd := exec.Command(exeFile, clientFlag,
-		"--service", serviceFlag,
-		"-Dlistenaddress", shared.QPepConfig.ListenHost,
-		verboseFlag)
+	cmd := exec.Command(exeFile, "-service", serviceFlag, clientFlag, verboseFlag)
 	if cmd == nil {
 		notify.ErrorMsg("Could not create client command")
 		return nil
 	}
 	cmd.Dir, _ = filepath.Abs(ExeDir)
-	logger.Info(cmd.String())
 	return cmd
 }
 

workers/gateway/gateway_interface_darwin.go

@@ -8,6 +8,7 @@ import (
 	"github.com/Project-Faster/qpep/shared/configuration"
 	"github.com/Project-Faster/qpep/shared/logger"
 	"github.com/jackpal/gateway"
+	"net"
 	"net/url"
 	"regexp"
 	"strconv"