From 2f6439654a86a6afe2368299075cc6b2d26f805f Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Tue, 8 Feb 2022 22:31:17 -0500
Subject: [PATCH] fix compile errors

---
 netclient/command/commands.go |  7 ++-----
 netclient/daemon/freebsd.go   | 14 +++++++-------
 netclient/functions/common.go |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/netclient/command/commands.go b/netclient/command/commands.go
index bd8646b7..50b1beac 100644
--- a/netclient/command/commands.go
+++ b/netclient/command/commands.go
@@ -34,11 +34,8 @@ func Join(cfg config.ClientConfig, privateKey string) error {
 				if err != nil {
 					ncutils.PrintLog("error removing services: "+err.Error(), 1)
 				}
-				if ncutils.IsFreebsd() {
-					err = daemon.RemoveFreebsdDaemon()
-				}
-				if err != nil {
-					ncutils.PrintLog("error removing services: "+err.Error(), 1)
+				if ncutils.IsFreeBSD() {
+					daemon.RemoveFreebsdDaemon()
 				}
 			}
 		} else {
diff --git a/netclient/daemon/freebsd.go b/netclient/daemon/freebsd.go
index 2a359770..c701af26 100644
--- a/netclient/daemon/freebsd.go
+++ b/netclient/daemon/freebsd.go
@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"log"
 	"path/filepath"
+	"os"
 
 	"github.com/gravitl/netmaker/netclient/ncutils"
 )
 
-const EXEC_DIR = "/sbin"
-
 // SetupFreebsdDaemon -- sets up daemon for freebsd
 func SetupFreebsdDaemon() error {
 	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
@@ -87,7 +86,7 @@ netclient_args="daemon"`
 
 	rcbytes := []byte(rcFile)
 	if !ncutils.FileExists("/etc/rc.d/netclient") {
-		err := os.Write("/etc/rc.d/netclient", rcbytes, 0744)
+		err := os.WriteFile("/etc/rc.d/netclient", rcbytes, 0744)
 		if err != nil {
 			return err
 		}
@@ -101,13 +100,14 @@ netclient_args="daemon"`
 			return nil
 		}
 	}
+	return nil
 }
 
 func FreebsdDaemon(command string) {
-	_, _ := ncutils.RunCmd(fmt.Sprintf("service netclient %s", command), true)
+	_, _ = ncutils.RunCmd(fmt.Sprintf("service netclient %s", command), true)
 }
 
-func CleanUpFreebsd() {
+func CleanupFreebsd() {
 	if err := os.RemoveAll(ncutils.GetNetclientPath()); err != nil {
 		ncutils.PrintLog("Removing netclient configs: "+err.Error(), 1)
 	}
@@ -118,13 +118,13 @@ func CleanUpFreebsd() {
 
 func RemoveFreebsdDaemon() {
 	if ncutils.FileExists("/etc/rc.d/netclient") {
-		err = os.Remove("/etc/rc.d/netclient")
+		err := os.Remove("/etc/rc.d/netclient")
 		if err != nil {
 			ncutils.Log("Error removing /etc/rc.d/netclient. Please investigate.")
 		}
 	}
 	if ncutils.FileExists("/etc/rc.conf.d/netclient") {
-		err = os.Remove("/etc/rc.conf.d/netclient")
+		err := os.Remove("/etc/rc.conf.d/netclient")
 		if err != nil {
 			ncutils.Log("Error removing /etc/rc.conf.d/netclient. Please investigate.")
 		}
diff --git a/netclient/functions/common.go b/netclient/functions/common.go
index 59c9ec9c..672eb011 100644
--- a/netclient/functions/common.go
+++ b/netclient/functions/common.go
@@ -137,7 +137,7 @@ func Uninstall() error {
 		daemon.CleanupMac()
 	} else if ncutils.IsLinux() {
 		daemon.CleanupLinux()
-	} else if ncutils.IsFreebsd() {
+	} else if ncutils.IsFreeBSD() {
 		daemon.CleanupFreebsd()
 	} else if !ncutils.IsKernel() {
 		ncutils.PrintLog("manual cleanup required", 1)
@@ -235,7 +235,7 @@ func RemoveLocalInstance(cfg *config.ClientConfig, networkName string) error {
 			// TODO: Remove job?
 		} else if ncutils.IsMac() {
 			//TODO: Delete mac daemon
-		} else if ncutils.IsFreebsd() {
+		} else if ncutils.IsFreeBSD() {
 			daemon.RemoveFreebsdDaemon()
 		} else {
 			daemon.RemoveSystemDServices()