From 4706eb5114374df967c671bd740c0eb9aa020a9c Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 14 Jun 2018 16:38:47 -0700 Subject: [PATCH] Add platform-specific compile directives for security modules --- security/{dns_darwin.go => dns.go} | 2 ++ security/dns_windows.go | 3 ++- security/{users_darwin.go => users.go} | 2 ++ security/users_windows.go | 2 ++ security/{widget_darwin.go => widget.go} | 2 ++ security/widget_windows.go | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) rename security/{dns_darwin.go => dns.go} (98%) rename security/{users_darwin.go => users.go} (98%) rename security/{widget_darwin.go => widget.go} (98%) diff --git a/security/dns_darwin.go b/security/dns.go similarity index 98% rename from security/dns_darwin.go rename to security/dns.go index 2408c2c1..2064ecf7 100644 --- a/security/dns_darwin.go +++ b/security/dns.go @@ -1,3 +1,5 @@ +// +build !windows + package security import ( diff --git a/security/dns_windows.go b/security/dns_windows.go index 8e3db0e8..dae7966c 100644 --- a/security/dns_windows.go +++ b/security/dns_windows.go @@ -1,3 +1,5 @@ +// +build windows + package security import ( @@ -6,7 +8,6 @@ import ( "github.com/senorprogrammer/wtf/wtf" ) - func DnsServers() []string { cmd := exec.Command("powershell.exe", "Get-DnsClientServerAddress | Select-Object –ExpandProperty ServerAddresses") return []string{wtf.ExecuteCommand(cmd)} diff --git a/security/users_darwin.go b/security/users.go similarity index 98% rename from security/users_darwin.go rename to security/users.go index b8fe5164..41068b3e 100644 --- a/security/users_darwin.go +++ b/security/users.go @@ -1,3 +1,5 @@ +// +build !windows + package security // http://applehelpwriter.com/2017/05/21/how-to-reveal-hidden-users/ diff --git a/security/users_windows.go b/security/users_windows.go index 587ad88f..38c77d9f 100644 --- a/security/users_windows.go +++ b/security/users_windows.go @@ -1,3 +1,5 @@ +// +build windows + package security import ( diff --git a/security/widget_darwin.go b/security/widget.go similarity index 98% rename from security/widget_darwin.go rename to security/widget.go index f5769b8e..17d91135 100644 --- a/security/widget_darwin.go +++ b/security/widget.go @@ -1,3 +1,5 @@ +// +build !windows + package security import ( diff --git a/security/widget_windows.go b/security/widget_windows.go index c2bccdd1..8ce3652b 100644 --- a/security/widget_windows.go +++ b/security/widget_windows.go @@ -1,3 +1,5 @@ +// +build windows + package security import (