From 56067aef86156038fcb34b19f2139bd84407f1cc Mon Sep 17 00:00:00 2001
From: alexfornuto <alex@fornuto.com>
Date: Sat, 31 Aug 2019 03:23:53 -0500
Subject: [PATCH 1/2] Find SSID regardless of network manager

---
 modules/security/wifi.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/security/wifi.go b/modules/security/wifi.go
index 3f1a3868..9a80e3ee 100644
--- a/modules/security/wifi.go
+++ b/modules/security/wifi.go
@@ -66,11 +66,10 @@ func wifiInfo() string {
 }
 
 func wifiNameLinux() string {
-	cmd := exec.Command("nmcli", "-t", "-f", "in-use,ssid", "dev", "wifi")
-	out := utils.ExecuteCommand(cmd)
-	name := utils.FindMatch(`\*:(.+)`, out)
+  cmd := exec.Command("/usr/sbin/iwgetid", "-r")
+	name := utils.ExecuteCommand(cmd)
 	if len(name) > 0 {
-		return name[0][1]
+		return name
 	}
 	return ""
 }

From cf3cda3b13f3ab50d0250104abfa81ba6f83c62b Mon Sep 17 00:00:00 2001
From: Alex Fornuto <alex.fornuto@pantheon.io>
Date: Thu, 10 Oct 2019 14:41:14 -0500
Subject: [PATCH 2/2] simplify iwgetid use

---
 modules/security/wifi.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/security/wifi.go b/modules/security/wifi.go
index 9a80e3ee..8f6c535b 100644
--- a/modules/security/wifi.go
+++ b/modules/security/wifi.go
@@ -66,14 +66,12 @@ func wifiInfo() string {
 }
 
 func wifiNameLinux() string {
-  cmd := exec.Command("/usr/sbin/iwgetid", "-r")
-	name := utils.ExecuteCommand(cmd)
-	if len(name) > 0 {
-		return name
-	}
-	return ""
+  cmd, _ := exec.Command("iwgetid", "-r").Output()
+  return string(cmd)
 }
 
+
+
 func wifiNameMacOS() string {
 	name := utils.FindMatch(`s*SSID: (.+)s*`, wifiInfo())
 	return matchStr(name)