1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Merge pull request #365 from jdenoy/master

Changed nmcli cmd to check on AP connect to using '*' in the in-use f…
This commit is contained in:
Chris Cummer 2019-01-30 09:50:28 -08:00 committed by GitHub
commit ab0dde5169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -43,10 +43,10 @@ func WifiName() string {
/* -------------------- Unexported Functions -------------------- */
func wifiEncryptionLinux() string {
cmd := exec.Command("nmcli", "-t", "-f", "active,security", "dev", "wifi")
cmd := exec.Command("nmcli", "-t", "-f", "in-use,security", "dev", "wifi")
out := wtf.ExecuteCommand(cmd)
name := wtf.FindMatch(`yes:(.+)`, out)
name := wtf.FindMatch(`\*:(.+)`, out)
if len(name) > 0 {
return name[0][1]
@ -66,9 +66,9 @@ func wifiInfo() string {
}
func wifiNameLinux() string {
cmd := exec.Command("nmcli", "-t", "-f", "active,ssid", "dev", "wifi")
cmd := exec.Command("nmcli", "-t", "-f", "in-use,ssid", "dev", "wifi")
out := wtf.ExecuteCommand(cmd)
name := wtf.FindMatch(`yes:(.+)`, out)
name := wtf.FindMatch(`\*:(.+)`, out)
if len(name) > 0 {
return name[0][1]
}