jinql
/
goproxy
mirror of https://github.com/goproxyio/goproxy
1
0
Fork 0
Code Issues Releases Wiki Activity

fix non-unix OS use Join

pull/128/head^2
kun 2019-11-28 17:31:52 +08:00
parent 970dde4fb9
commit 02f5e37219
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -119,7 +119,7 @@ func getDownloadRoot() string {
} }
if cacheDir != "" { if cacheDir != "" {
os.Setenv("GOPATH", cacheDir) os.Setenv("GOPATH", cacheDir)
return filepath.Join(cacheDir, "pkg/mod/cache/download") return filepath.Join(cacheDir, "pkg", "mod", "cache", "download")
} }
if err := goJSON(&env, "go", "env", "-json", "GOPATH"); err != nil { if err := goJSON(&env, "go", "env", "-json", "GOPATH"); err != nil {
log.Fatal(err) log.Fatal(err)
@ -128,7 +128,7 @@ func getDownloadRoot() string {
if len(list) == 0 || list[0] == "" { if len(list) == 0 || list[0] == "" {
log.Fatalf("missing $GOPATH") log.Fatalf("missing $GOPATH")
} }
return filepath.Join(list[0], "pkg/mod/cache/download") return filepath.Join(list[0], "pkg", "mod", "cache", "download")
} }
// goJSON runs the go command and parses its JSON output into dst. // goJSON runs the go command and parses its JSON output into dst.
@ -177,7 +177,7 @@ func (*ops) List(ctx context.Context, mpath string) (proxy.File, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
file := filepath.Join(downloadRoot, escMod+"/@v/list") file := filepath.Join(downloadRoot, escMod, "@v", "list")
if info, err := os.Stat(file); err == nil && time.Since(info.ModTime()) < listExpire { if info, err := os.Stat(file); err == nil && time.Since(info.ModTime()) < listExpire {
return os.Open(file) return os.Open(file)
} }