From b74c46b031f9183c086d8b82157d7183251461ac Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Mar 2023 16:56:09 -0500 Subject: TrimSpace() Signed-off-by: Jeff Carr --- gui.go | 3 +-- net.go | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gui.go b/gui.go index 649a437..eb02fd6 100644 --- a/gui.go +++ b/gui.go @@ -179,8 +179,7 @@ func updateDNS() { } } } - all = strings.TrimSuffix(all, "\r\n") - all = strings.TrimSuffix(all, "\n") + all = strings.TrimSpace(all) me.DnsAAAA.SetText(all) if (broken == 1) { me.DnsStatus.SetText("WORKING") diff --git a/net.go b/net.go index a519fa1..0efa6c0 100644 --- a/net.go +++ b/net.go @@ -225,10 +225,8 @@ func scanInterfaces() { all6 += s + "\n" } } - all4 = strings.TrimSuffix(all4, "\r\n") - all4 = strings.TrimSuffix(all4, "\n") - all6 = strings.TrimSuffix(all6, "\r\n") - all6 = strings.TrimSuffix(all6, "\n") + all4 = strings.TrimSpace(all4) + all6 = strings.TrimSpace(all6) me.IPv4.SetText(all4) me.IPv6.SetText(all6) } -- cgit v1.2.3