Merge pull request #998 from gravitl/bugfix_v0.12.3_binary_path

use os.Executable

netclient/daemon/freebsd.go

@@ -3,7 +3,6 @@ package daemon
 import (
 	"log"
 	"os"
-	"path/filepath"
 
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/netclient/ncutils"
@@ -11,11 +10,10 @@ import (
 
 // SetupFreebsdDaemon -- sets up daemon for freebsd
 func SetupFreebsdDaemon() error {
-	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	binarypath, err := os.Executable()
 	if err != nil {
 		return err
 	}
-	binarypath := dir + "/netclient"
 
 	_, err = os.Stat("/etc/netclient/config")
 	if os.IsNotExist(err) {

netclient/daemon/macos.go

@@ -3,7 +3,6 @@ package daemon
 import (
 	"log"
 	"os"
-	"path/filepath"
 	"time"
 
 	"github.com/gravitl/netmaker/logger"
@@ -16,11 +15,10 @@ const MAC_EXEC_DIR = "/usr/local/bin/"
 // SetupMacDaemon - Creates a daemon service from the netclient under LaunchAgents for MacOS
 func SetupMacDaemon() error {
 
-	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	binarypath, err := os.Executable()
 	if err != nil {
 		return err
 	}
-	binarypath := dir + "/netclient"
 
 	if !ncutils.FileExists(MAC_EXEC_DIR + "netclient") {
 		err = ncutils.Copy(binarypath, MAC_EXEC_DIR+"netclient")

netclient/daemon/systemd.go

@@ -20,11 +20,10 @@ func SetupSystemDDaemon() error {
 	if ncutils.IsWindows() {
 		return nil
 	}
-	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	binarypath, err := os.Executable()
 	if err != nil {
 		return err
 	}
-	binarypath := dir + "/netclient"
 
 	_, err = os.Stat("/etc/netclient/config")
 	if os.IsNotExist(err) {