MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-16 00:49:09 -04:00
Code Issues Packages 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
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

4
pkg/user/user.go
View File

@ -39,7 +39,8 @@ 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" {
if runtime.GOOS == "linux" || runtime.GOOS == "darwin" {
return &user.User{ return &user.User{
Uid: strconv.Itoa(os.Getuid()), Uid: strconv.Itoa(os.Getuid()),
Gid: strconv.Itoa(os.Getgid()), Gid: strconv.Itoa(os.Getgid()),
@ -48,6 +49,7 @@ func Current() (*user.User, error) {
HomeDir: os.Getenv("HOME"), HomeDir: os.Getenv("HOME"),
}, nil }, nil
} }
}
user, e := user.Current() user, e := user.Current()
if e != nil { if e != nil {
return nil, e return nil, e