From 14b1f561b1a79ece8dd2d10e02565172ce91649f Mon Sep 17 00:00:00 2001 From: afeiszli Date: Fri, 6 May 2022 15:21:57 -0400 Subject: [PATCH] updating netclient.exe for new gui --- netclient/functions/common.go | 27 ++++++++++--------- netclient/main.go | 2 +- netclient/netclient.exe.manifest.xml | 2 +- netclient/versioninfo.json | 6 ++--- netclient/windowsdata/resource/netclient.ico | Bin 0 -> 983 bytes netclient/windowsdata/resource/netmaker.ico | Bin 7562 -> 0 bytes 6 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 netclient/windowsdata/resource/netclient.ico delete mode 100644 netclient/windowsdata/resource/netmaker.ico diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 1a2d3dbe..f7a86db1 100644 --- a/netclient/functions/common.go +++ b/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) - } - 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) + logger.Log(0, "unable to authenticate: "+err.Error()) } else { - bodybytes, _ := io.ReadAll(response.Body) - defer response.Body.Close() - return fmt.Errorf("error deleting node on server %s %s", response.Status, string(bodybytes)) + url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID + response, err := API("", http.MethodDelete, url, token) + 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() diff --git a/netclient/main.go b/netclient/main.go index 462b9df7..6293297a 100644 --- a/netclient/main.go +++ b/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 diff --git a/netclient/netclient.exe.manifest.xml b/netclient/netclient.exe.manifest.xml index 739dbf89..8c744b0f 100644 --- a/netclient/netclient.exe.manifest.xml +++ b/netclient/netclient.exe.manifest.xml @@ -1,7 +1,7 @@ q9jd4}Bz9`Qhm zu{g-xiSg!1oq8aLv%n*=n1O*?7=#%aX3dcRDku!_32_BV3eH_Jis%*sZn+DKfPr3J z666=mAg;wCxcRwv)$jjj3@vZ`S;}?GPht6;HMYG^1a^E@*PHKff63$zssVpf??$}S zXSB;JxczHcLd+@C{onsBV7uCyc7El{BSJqinSVY_6nm?!eCarEF2@QDSr6{QoVlMS z)cLQMejxX1if2;yR-Kz&{FN8C8C;)ep?0u@Nh!U1r#>(ZBzd|xhE&WsdnG*lkbwyM zhm7p4;VdC6BBI-O1nBG#U=$50Sn%jx_2YT-@3pkqUHGQrFZcfT-{<9iv!86^_jL)1zO%`phR~W2J8PXwS--WpRpHwJZo6RrK>hB6fCLE#&Nep}VUESgCKBv3 zI3#jr9oWEo`Xq<6pQ~X=QjSEqPqJn5!v?t`kIkHBE{5_BMS1ghTOTkvXq|1#xY#GZ zZ_Ams4AthRucV|Gl@`s)s;c22WQ%mvv4FO#r~qp-TV& literal 0 HcmV?d00001 diff --git a/netclient/windowsdata/resource/netmaker.ico b/netclient/windowsdata/resource/netmaker.ico deleted file mode 100644 index 49b5b0fdb99a72b39bf796b324a54106047b8613..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7562 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