fix install malice-network

M09Ic · M09Ic · commit 177adf66cb26 · 2024-09-23T18:37:41.000+08:00
diff --git a/internal/runner/banner.go b/internal/runner/banner.go
@@ -4,7 +4,7 @@ import (
 	"github.com/chainreactors/crtm/pkg/update"
 )
 
-const version = "v0.0.1"
+const version = "v0.0.2"
 
 //var banner = `
 //                ____
diff --git a/pkg/install.go b/pkg/install.go
@@ -65,19 +65,19 @@ loop:
 	for asset, assetID := range tool.Assets {
 		switch {
 		case strings.Contains(asset, ".zip"):
-			if isAsset(asset, tool.Repo, runtime.GOOS, runtime.GOARCH) {
+			if isAsset(asset, tool.Name, runtime.GOOS, runtime.GOARCH) {
 				id = assetID
 				isZip = true
 				break loop
 			}
 		case strings.Contains(asset, ".tar.gz"):
-			if isAsset(asset, tool.Repo, runtime.GOOS, runtime.GOARCH) {
+			if isAsset(asset, tool.Name, runtime.GOOS, runtime.GOARCH) {
 				id = assetID
 				isTar = true
 				break loop
 			}
 		default:
-			if isAsset(asset, tool.Repo, runtime.GOOS, runtime.GOARCH) {
+			if isAsset(asset, tool.Name, runtime.GOOS, runtime.GOARCH) {
 				id = assetID
 				break loop
 			}
@@ -129,7 +129,7 @@ loop:
 }
 
 func isAsset(asset, name, os, arch string) bool {
-	if strings.Contains(asset, name) && strings.Contains(asset, os+"_") && strings.Contains(asset, arch) {
+	if strings.Contains(asset, name) && strings.Contains(asset, os) && strings.Contains(asset, arch) {
 		return true
 	}
 	return false
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -28,7 +28,7 @@ var (
 		"zombie":         ZombieRepo,
 		"urlfounder":     UrlFounderRepo,
 		"iom":            IoMRepo,
-		"malice-network": IoMRepo,
+		"malice_network": IoMRepo,
 		//"cdncheck_cn": CDNCheckRepo,
 	}
 )

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"github.com/chainreactors/crtm/pkg/update"`
`5`	`5`	`)`
`6`	`6`
`7`		`-const version = "v0.0.1"`
	`7`	`+const version = "v0.0.2"`
`8`	`8`
`9`	`9`	//var banner = `
`10`	`10`	`// ____`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ var (`
`28`	`28`	`"zombie": ZombieRepo,`
`29`	`29`	`"urlfounder": UrlFounderRepo,`
`30`	`30`	`"iom": IoMRepo,`
`31`		`- "malice-network": IoMRepo,`
	`31`	`+ "malice_network": IoMRepo,`
`32`	`32`	`//"cdncheck_cn": CDNCheckRepo,`
`33`	`33`	`}`
`34`	`34`	`)`