updating netclient.exe for new gui

netclient/functions/common.go

@@ -133,6 +133,7 @@ func Uninstall() error {
 			}
 		}
 	}
+	err = nil
 	// clean up OS specific stuff
 	if ncutils.IsWindows() {
 		daemon.CleanupWindows()
@@ -159,19 +160,21 @@ func LeaveNetwork(network string, force bool) error {
 	if node.IsServer != "yes" {
 		token, err := Authenticate(cfg)
 		if err != nil {
-			return fmt.Errorf("unable to authenticate %w", err)
+			logger.Log(0, "unable to authenticate: "+err.Error())
-		}
-		url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID
-		response, err := API("", http.MethodDelete, url, token)
-		if err != nil {
-			return fmt.Errorf("error deleting node on server %w", err)
-		}
-		if response.StatusCode == http.StatusOK {
-			logger.Log(0, "deleted node", cfg.Node.Name, " on network ", cfg.Network)
 		} else {
-			bodybytes, _ := io.ReadAll(response.Body)
+			url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID
-			defer response.Body.Close()
+			response, err := API("", http.MethodDelete, url, token)
-			return fmt.Errorf("error deleting node on server %s %s", response.Status, string(bodybytes))
+			if err != nil {
+				logger.Log(0, "error deleting node on server: "+err.Error())
+			} else {
+				if response.StatusCode == http.StatusOK {
+					logger.Log(0, "deleted node", cfg.Node.Name, " on network ", cfg.Network)
+				} else {
+					bodybytes, _ := io.ReadAll(response.Body)
+					defer response.Body.Close()
+					logger.Log(0, fmt.Sprintf("error deleting node on server %s %s", response.Status, string(bodybytes)))
+				}
+			}
 		}
 	}
 	wgClient, wgErr := wgctrl.New()

netclient/main.go

@@ -1,4 +1,4 @@
-//go:generate goversioninfo -icon=windowsdata/resource/netmaker.ico -manifest=netclient.exe.manifest.xml -64=true -o=netclient.syso
+//go:generate goversioninfo -icon=windowsdata/resource/netclient.ico -manifest=netclient.exe.manifest.xml -64=true -o=netclient.syso
 // -build gui
 
 package main

netclient/netclient.exe.manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
     <assemblyIdentity
-            version="0.13.1.0"
+            version="0.14.0.0"
             processorArchitecture="*"
             name="netclient.exe"
             type="win32"

netclient/versioninfo.json

@@ -2,13 +2,13 @@
     "FixedFileInfo": {
         "FileVersion": {
             "Major": 0,
-            "Minor": 9,
+            "Minor": 14,
             "Patch": 0,
             "Build": 0
         },
         "ProductVersion": {
             "Major": 0,
-            "Minor": 9,
+            "Minor": 14,
             "Patch": 0,
             "Build": 0
         },
@@ -29,7 +29,7 @@
         "OriginalFilename": "",
         "PrivateBuild": "",
         "ProductName": "Netclient",
-        "ProductVersion": "v0.13.1.0",
+        "ProductVersion": "v0.14.0.0",
         "SpecialBuild": ""
     },
     "VarFileInfo": {