Use native go method to get current user rather than environment variable (#4930)

* Use native go method to get current user rather than environment var

* Use t.Skip instead of return in test
This commit is contained in:
SagePtr 2018-10-18 09:08:20 +02:00 committed by Lunny Xiao
parent 637c5fe1eb
commit eb0c848f5b
2 changed files with 49 additions and 11 deletions

View file

@ -4,10 +4,29 @@
package user
import "os"
import (
"os"
"os/user"
"runtime"
"strings"
)
// CurrentUsername return current login OS user name
func CurrentUsername() string {
userinfo, err := user.Current()
if err != nil {
return fallbackCurrentUsername()
}
username := userinfo.Username
if runtime.GOOS == "windows" {
parts := strings.Split(username, "\\")
username = parts[len(parts)-1]
}
return username
}
// Old method, used if new method doesn't work on your OS for some reason
func fallbackCurrentUsername() string {
curUserName := os.Getenv("USER")
if len(curUserName) > 0 {
return curUserName