Skip to content

Commit c100502

Browse files
committed
feat(envscan): add distribution name detection
1 parent 4881903 commit c100502

File tree

5 files changed

+24
-1
lines changed

5 files changed

+24
-1
lines changed

envinspection/inspection.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ func InspectEnv(ctx context.Context) error {
1919

2020
var packageManager = "unmanaged"
2121
var osn, _ = osname.OsName()
22+
if runtime.GOOS == "linux" {
23+
packageManager = getOsInfo()
24+
}
2225
if s, ok := processByRule(osn); ok {
2326
packageManager = s
2427
}
@@ -48,7 +51,7 @@ func InspectEnv(ctx context.Context) error {
4851
for i := range module.Dependencies {
4952
module.Dependencies[i].IsOnline.SetOnline(false)
5053
module.Dependencies[i].IsDirectDependency = true
51-
module.Dependencies[i].EcoRepo.Repository = "unmanaged"
54+
module.Dependencies[i].EcoRepo.Repository = packageManager
5255
}
5356
task.Modules = append(task.Modules, module)
5457

envinspection/osinfo_linux.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package envinspection
2+
3+
import "github.com/zcalusic/sysinfo"
4+
5+
func getOsInfo() string {
6+
var si sysinfo.SysInfo
7+
si.GetSysInfo()
8+
return si.OS.Vendor + ":" + si.OS.Version
9+
}

envinspection/osinfo_windows.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package envinspection
2+
3+
func getOsInfo() string {
4+
return ""
5+
}

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require (
3131
github.com/titanous/json5 v1.0.0
3232
github.com/vifraa/gopom v0.2.2
3333
github.com/wk8/go-ordered-map/v2 v2.1.8
34+
github.com/zcalusic/sysinfo v1.1.3
3435
go.uber.org/zap v1.27.0
3536
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
3637
golang.org/x/mod v0.22.0
@@ -59,6 +60,7 @@ require (
5960
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6061
github.com/google/go-github/v47 v47.1.0 // indirect
6162
github.com/google/go-querystring v1.1.0 // indirect
63+
github.com/google/uuid v1.6.0 // indirect
6264
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6365
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
6466
github.com/inconshreveable/mousetrap v1.1.0 // indirect

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ github.com/google/go-github/v47 v47.1.0 h1:Cacm/WxQBOa9lF0FT0EMjZ2BWMetQ1TQfyurn
6969
github.com/google/go-github/v47 v47.1.0/go.mod h1:VPZBXNbFSJGjyjFRUKo9vZGawTajnWzC/YjGw/oFKi0=
7070
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
7171
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
72+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
73+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7274
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
7375
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
7476
github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
@@ -181,6 +183,8 @@ github.com/xanzy/go-gitlab v0.115.0/go.mod h1:5XCDtM7AM6WMKmfDdOiEpyRWUqui2iS9IL
181183
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
182184
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
183185
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
186+
github.com/zcalusic/sysinfo v1.1.3 h1:u/AVENkuoikKuIZ4sUEJ6iibpmQP6YpGD8SSMCrqAF0=
187+
github.com/zcalusic/sysinfo v1.1.3/go.mod h1:NX+qYnWGtJVPV0yWldff9uppNKU4h40hJIRPf/pGLv4=
184188
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
185189
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
186190
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

0 commit comments

Comments
 (0)