maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1106 from harshavardhana/support

Browse source 
pkg/user: Support 32bit darwin.
This commit is contained in:
Harshavardhana 2016-02-08 01:59:02 -08:00
parent e79a73a3f5 42fcb27308
commit 4e328d7b2c
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/user/user.go
View file

@ -39,14 +39,16 @@ func Current() (*user.User, error) {
} }
return &user.User{Uid: "0", Gid: "0", Username: "root", Name: "root", HomeDir: wd}, nil return &user.User{Uid: "0", Gid: "0", Username: "root", Name: "root", HomeDir: wd}, nil
} }
if runtime.GOARCH == "386" && runtime.GOOS == "linux" { if runtime.GOARCH == "386" {
return &user.User{ if runtime.GOOS == "linux" || runtime.GOOS == "darwin" {
Uid: strconv.Itoa(os.Getuid()), return &user.User{
Gid: strconv.Itoa(os.Getgid()), Uid: strconv.Itoa(os.Getuid()),
Username: os.Getenv("USER"), Gid: strconv.Itoa(os.Getgid()),
Name: os.Getenv("USER"), Username: os.Getenv("USER"),
HomeDir: os.Getenv("HOME"), Name: os.Getenv("USER"),
}, nil HomeDir: os.Getenv("HOME"),
}, nil
}
} }
user, e := user.Current() user, e := user.Current()
if e != nil { if e != nil {