Merge pull request #1429 from gravitl/hotfix_v0.14.6_mac_and_windows

removing windows from pid call and fixing nil pointer in mac

netclient/ncutils/pid.go

@@ -20,7 +20,7 @@ func (*WindowsPIDError) Error() string {
 // SavePID - saves the pid of running program to disk
 func SavePID() error {
 	if IsWindows() {
-		return &WindowsPIDError{}
+		return nil
 	}
 	pid := os.Getpid()
 	if err := os.WriteFile(PIDFILE, []byte(fmt.Sprintf("%d", pid)), 0644); err != nil {
@@ -32,7 +32,7 @@ func SavePID() error {
 // ReadPID - reads a previously saved pid from disk
 func ReadPID() (int, error) {
 	if IsWindows() {
-		return 0, &WindowsPIDError{}
+		return 0, nil
 	}
 	bytes, err := os.ReadFile(PIDFILE)
 	if err != nil {

netclient/wireguard/mac.go

@@ -151,7 +151,7 @@ func deleteInterface(iface string, realIface string) error {
 		os.Remove("/var/run/wireguard/" + iface + ".name")
 	}
 	out, err = ncutils.RunCmd("ifconfig "+realIface+" down", false)
-	if strings.Contains(err.Error(), "does not exist") {
+	if err != nil && strings.Contains(err.Error(), "does not exist") {
 		err = nil
 	} else if err != nil && out != "" {
 		err = errors.New(out)