diff --git a/cli/install.go b/cli/install.go index 8fff7af..6c2c2f9 100644 --- a/cli/install.go +++ b/cli/install.go @@ -16,6 +16,7 @@ import ( ) func fundVersion(version string) *collector.GradleItem { + collector.Init() rs := collector.Collector.Items for _, v := range rs { if v.Version == version { //strings.Contains(v.SimpleName, version) diff --git a/cli/ls-remote.go b/cli/ls-remote.go index d5e39e5..bc61046 100644 --- a/cli/ls-remote.go +++ b/cli/ls-remote.go @@ -28,6 +28,7 @@ func remoteVersionLength2(version string) string { func listRemote(*cli.Context) (err error) { use_version := inuse(goroot) out := ansi.NewAnsiStdout() + collector.Init() rs := collector.Collector.Items color.New(color.FgGreen).Fprintf(out, " %s\n", " version info RelaseTime") for _, v := range rs { diff --git a/internal/pkg/collector/collector.go b/internal/pkg/collector/collector.go index 395ab5b..8a3fd5e 100644 --- a/internal/pkg/collector/collector.go +++ b/internal/pkg/collector/collector.go @@ -22,7 +22,7 @@ type GradleItem struct { DownloadUrl string } -func init() { +func Init() { Collector = &GradleCollector{ Items: getGradleAllInfo(), } diff --git a/makefile b/makefile index 5d65adf..2b568ea 100644 --- a/makefile +++ b/makefile @@ -17,33 +17,33 @@ build-all: build-linux build-darwin build-windows build-linux: build-linux-386 build-linux-amd64 build-linux-arm build-linux-arm64 build-linux-s390x build-linux-386: - GOOS=linux GOARCH=386 $(GO) build $(GO_FLAGS) -o bin/linux-386/j + GOOS=linux GOARCH=386 $(GO) build $(GO_FLAGS) -o bin/linux-386/grvm build-linux-amd64: - GOOS=linux GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/linux-amd64/linux_amd_x86_64_j + GOOS=linux GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/linux-amd64/linux_amd_x86_64_grvm build-linux-arm: - GOOS=linux GOARCH=arm $(GO) build $(GO_FLAGS) -o bin/linux-arm/j + GOOS=linux GOARCH=arm $(GO) build $(GO_FLAGS) -o bin/linux-arm/grvm build-linux-arm64: - GOOS=linux GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/linux-arm64/j + GOOS=linux GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/linux-arm64/grvm build-linux-s390x: - GOOS=linux GOARCH=s390x $(GO) build $(GO_FLAGS) -o bin/linux-s390x/j + GOOS=linux GOARCH=s390x $(GO) build $(GO_FLAGS) -o bin/linux-s390x/grvm build-darwin: build-darwin-amd64 build-darwin-arm64 build-darwin-amd64: - GOOS=darwin GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/darwin-amd64/j + GOOS=darwin GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/darwin-amd64/grvm build-darwin-arm64: - GOOS=darwin GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/darwin-arm64/j + GOOS=darwin GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/darwin-arm64/grvm build-windows: build-windows-386 build-windows-amd64 build-windows-arm build-windows-arm64 build-windows-386: - GOOS=windows GOARCH=386 $(GO) build $(GO_FLAGS) -o bin/windows-386/j.exe + GOOS=windows GOARCH=386 $(GO) build $(GO_FLAGS) -o bin/windows-386/grvm.exe build-windows-amd64: - GOOS=windows GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/windows-amd64/windows_amd_x86_64_j.exe + GOOS=windows GOARCH=amd64 $(GO) build $(GO_FLAGS) -o bin/windows-amd64/windows_amd_x86_64_grvm.exe build-windows-arm: - GOOS=windows GOARCH=arm $(GO) build $(GO_FLAGS) -o bin/windows-arm/j.exe + GOOS=windows GOARCH=arm $(GO) build $(GO_FLAGS) -o bin/windows-arm/grvm.exe build-windows-arm64: - GOOS=windows GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/windows-arm64/j.exe + GOOS=windows GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/windows-arm64/grvm.exe package: sh ./package.sh