From e0e31c041ab5d11b0a7f2f146dae262d743bf9ce Mon Sep 17 00:00:00 2001
From: idk <idk@idk.local>
Date: Tue, 20 Aug 2019 23:53:47 -0400
Subject: [PATCH] vpn prep

---
 Makefile            |  2 +-
 gui/static.go       |  2 ++
 manager/manager.go  | 20 ++++++++++++++++++++
 manager/nostatic.go |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 42e5d2b..1f93829 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ fix-debian:
 	find ./debian -type f -exec sed -i 's|eyedeekay@safe-mail.net|hankhill19580@gmail.com|g' {} \;
 
 try:
-	cd etc/samcatd/ && ../../bin/samcatd-webview -f tunnels.ini
+	cd etc/samcatd/ && ../../bin/samcatd -f tunnels.ini
 
 test: test-keys test-ntcp test-ssu test-config test-manager
 
diff --git a/gui/static.go b/gui/static.go
index bee9e82..cb02449 100644
--- a/gui/static.go
+++ b/gui/static.go
@@ -7,6 +7,8 @@ import (
 	"github.com/zserge/lorca"
 )
 
+var USER = ""
+
 func LaunchUI(s samtunnel.WebUI) (lorca.UI, error) {
 	if s.UseWebUI() == true {
 		if lorca.LocateChrome() != "" {
diff --git a/manager/manager.go b/manager/manager.go
index 203ccee..b5d2e9e 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -3,6 +3,9 @@ package sammanager
 import (
 	"fmt"
 	"log"
+	"os/exec"
+	"os/user"
+	"runtime"
 	"strconv"
 )
 
@@ -67,6 +70,23 @@ func (s *SAMManager) URL() string {
 	return "http://" + s.WebHost + ":" + s.WebPort
 }
 
+func User() string {
+	runningUser, _ := user.Current()
+	if runtime.GOOS != "windows" {
+		if runningUser.Uid == "0" {
+			cmd := exec.Command("logname")
+			out, err := cmd.Output()
+			if err != nil {
+				return err.Error()
+			}
+			return string(out)
+		}
+	}
+	return runningUser.Name
+}
+
+var runningUser = User()
+
 func NewSAMManagerFromOptions(opts ...func(*SAMManager) error) (*SAMManager, error) {
 	var s SAMManager
 	s.FilePath = ""
diff --git a/manager/nostatic.go b/manager/nostatic.go
index f202402..b677662 100644
--- a/manager/nostatic.go
+++ b/manager/nostatic.go
@@ -39,7 +39,7 @@ func (s *SAMManager) Serve() bool {
 			return false
 		} else {
 			view.Run()
-            return true
+			return true
 		}
 	} else {
 		return Exit()