Skip to content

Commit cb08feb

Browse files
committed
fix license generate
1 parent e7d90ad commit cb08feb

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.osspkg.com/goppy/v2
33
go 1.25.0
44

55
require (
6-
github.com/blevesearch/bleve/v2 v2.5.3
6+
github.com/blevesearch/bleve/v2 v2.5.4
77
github.com/go-sql-driver/mysql v1.9.3
88
github.com/google/uuid v1.6.0
99
github.com/gorilla/websocket v1.5.3
@@ -18,7 +18,7 @@ require (
1818
go.osspkg.com/casecheck v0.3.0
1919
go.osspkg.com/config v0.2.0
2020
go.osspkg.com/console v0.3.3
21-
go.osspkg.com/do v0.1.3
21+
go.osspkg.com/do v0.2.0
2222
go.osspkg.com/errors v0.4.0
2323
go.osspkg.com/events v0.3.0
2424
go.osspkg.com/grape v1.3.0
@@ -33,7 +33,7 @@ require (
3333
go.osspkg.com/xc v0.4.0
3434
go.uber.org/automaxprocs v1.6.0
3535
golang.org/x/crypto v0.43.0
36-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b
36+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
3737
golang.org/x/mod v0.29.0
3838
golang.org/x/oauth2 v0.32.0
3939
google.golang.org/protobuf v1.36.10
@@ -43,7 +43,7 @@ require (
4343
cloud.google.com/go/compute/metadata v0.3.0 // indirect
4444
filippo.io/edwards25519 v1.1.0 // indirect
4545
github.com/BurntSushi/toml v1.5.0 // indirect
46-
github.com/RoaringBitmap/roaring/v2 v2.10.0 // indirect
46+
github.com/RoaringBitmap/roaring/v2 v2.13.0 // indirect
4747
github.com/beorn7/perks v1.0.1 // indirect
4848
github.com/bits-and-blooms/bitset v1.24.1 // indirect
4949
github.com/blevesearch/bleve_index_api v1.2.10 // indirect
@@ -65,7 +65,6 @@ require (
6565
github.com/blevesearch/zapx/v16 v16.2.6 // indirect
6666
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6767
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
68-
github.com/golang/protobuf v1.5.4 // indirect
6968
github.com/golang/snappy v1.0.0 // indirect
7069
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
7170
github.com/josharian/intern v1.0.0 // indirect

go.sum

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
44
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
55
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
66
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
7-
github.com/RoaringBitmap/roaring/v2 v2.10.0 h1:HbJ8Cs71lfCJyvmSptxeMX2PtvOC8yonlU0GQcy2Ak0=
8-
github.com/RoaringBitmap/roaring/v2 v2.10.0/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0=
7+
github.com/RoaringBitmap/roaring/v2 v2.13.0 h1:38BxJ6lGPcBLykIRCyYtViB/By3+a/iS9znKsiBbhNc=
8+
github.com/RoaringBitmap/roaring/v2 v2.13.0/go.mod h1:Mpi+oQ+3oCU7g1aF75Ib/XYCTqjTGpHI0f8djSZVY3I=
99
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1010
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
11-
github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
1211
github.com/bits-and-blooms/bitset v1.24.1 h1:hqnfFbjjk3pxGa5E9Ho3hjoU7odtUuNmJ9Ao+Bo8s1c=
1312
github.com/bits-and-blooms/bitset v1.24.1/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
14-
github.com/blevesearch/bleve/v2 v2.5.3 h1:9l1xtKaETv64SZc1jc4Sy0N804laSa/LeMbYddq1YEM=
15-
github.com/blevesearch/bleve/v2 v2.5.3/go.mod h1:Z/e8aWjiq8HeX+nW8qROSxiE0830yQA071dwR3yoMzw=
13+
github.com/blevesearch/bleve/v2 v2.5.4 h1:1iur8e+PHsxtncV2xIVuqlQme/V8guEDO2uV6Wll3lQ=
14+
github.com/blevesearch/bleve/v2 v2.5.4/go.mod h1:yB4PnV4N2q5rTEpB2ndG8N2ISexBQEFIYgwx4ztfvoo=
1615
github.com/blevesearch/bleve_index_api v1.2.10 h1:FMFmZCmTX6PdoLLvwUnKF2RsmILFFwO3h0WPevXY9fE=
1716
github.com/blevesearch/bleve_index_api v1.2.10/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
1817
github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
@@ -59,8 +58,6 @@ github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1
5958
github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
6059
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
6160
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
62-
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
63-
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
6461
github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
6562
github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
6663
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -127,7 +124,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
127124
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
128125
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
129126
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
130-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
131127
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
132128
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
133129
go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
@@ -140,8 +136,8 @@ go.osspkg.com/config v0.2.0 h1:nPf14TX+HnVgOtlX1vobeTl//bQ3T/fAhXASaDRZ5rI=
140136
go.osspkg.com/config v0.2.0/go.mod h1:lYvJ3OfeWIQLr9ToRcDU+7fVCJLirDtKFpdxtAR8K1A=
141137
go.osspkg.com/console v0.3.3 h1:UB/pPoPsgWbyNFix8pEMQHbsXdMv/UK/dgsbRknCH2A=
142138
go.osspkg.com/console v0.3.3/go.mod h1:IknBCliH6mX/ogHa6wbycnGDFYixCGH3WuNc5W5tQe8=
143-
go.osspkg.com/do v0.1.3 h1:oNXeWZOQUv73LQLawKxfAyN1wacTtRZQVlrkN8nj+sw=
144-
go.osspkg.com/do v0.1.3/go.mod h1:hOQEum85f8Kc4m8PWUAECDQ/mTtQ4362ABLD+KW5/vk=
139+
go.osspkg.com/do v0.2.0 h1:6cGkaojx2mtRf97NkzdoaLBJU7TAoqnDmFMTVcIsJWc=
140+
go.osspkg.com/do v0.2.0/go.mod h1:ZViMiWrU6AfobhImtZvqe5n8ZiC/eT6KMF+5JHbZyAg=
145141
go.osspkg.com/errors v0.4.0 h1:E17+WyUzTXEHCTxGm8lOMPOOojzHG1lsOuQtTVGoATQ=
146142
go.osspkg.com/errors v0.4.0/go.mod h1:s75ZovPemYtrCtRPVsbQNq9MgMbmLMK1NEypr+uwjXI=
147143
go.osspkg.com/events v0.3.0 h1:W2IngTsKs0BKYIglqhrETwtpo6uNSZXWRIt0/l7c6dY=
@@ -176,8 +172,8 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
176172
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
177173
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
178174
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
179-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b h1:18qgiDvlvH7kk8Ioa8Ov+K6xCi0GMvmGfGW0sgd/SYA=
180-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
175+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
176+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
181177
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
182178
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
183179
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
@@ -200,7 +196,5 @@ google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j
200196
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
201197
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
202198
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
203-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
204-
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
205199
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
206200
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/commands/license.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"time"
1414

1515
"go.osspkg.com/console"
16+
"go.osspkg.com/do"
1617
"go.osspkg.com/ioutils/codec"
1718
"go.osspkg.com/ioutils/fs"
1819

@@ -38,8 +39,7 @@ func CmdLicense() console.CommandGetter {
3839
for sl := range licenses {
3940
supLics = append(supLics, sl)
4041
}
41-
console.Errorf("Update `%s`. Supported license %v", licFilename, supLics)
42-
os.Exit(1)
42+
console.Fatalf("Update `%s`. Supported license %v", licFilename, supLics)
4343
} else {
4444
console.FatalIfErr(codec.FileEncoder(licFilename).Decode(model), "Read `%s`", licFilename)
4545
}
@@ -59,12 +59,20 @@ func CmdLicense() console.CommandGetter {
5959

6060
console.FatalIfErr(licenseBuild(model), "Update main license")
6161

62-
goFiles, err := fs.SearchFilesByExt(fs.CurrentDir(), ".go")
62+
ignoreFiles := do.Entries[string, string, struct{}](model.IgnoreFiles, func(s string) (string, struct{}) {
63+
return s, struct{}{}
64+
})
65+
66+
currDir := fs.CurrentDir()
67+
goFiles, err := fs.SearchFilesByExt(currDir, ".go")
6368
console.FatalIfErr(err, "Get go files")
6469
for _, file := range goFiles {
6570
if strings.HasSuffix(file, "_easyjson.go") || strings.Contains(file, "/vendor/") {
6671
continue
6772
}
73+
if _, ok := ignoreFiles[strings.TrimLeft(strings.TrimPrefix(file, currDir), "/")]; ok {
74+
continue
75+
}
6876
err = fs.RewriteFile(file, func(b []byte) ([]byte, error) {
6977
tmpl := buildTemplate(model)
7078
return licenseReplace(b, tmpl)
@@ -78,10 +86,11 @@ func CmdLicense() console.CommandGetter {
7886
}
7987

8088
type License struct {
81-
Author string `yaml:"author"`
82-
LicShort string `yaml:"lic_short"`
83-
LicFile string `yaml:"lic_file"`
84-
Years string `yaml:"-"`
89+
Author string `yaml:"author"`
90+
LicShort string `yaml:"lic_short"`
91+
LicFile string `yaml:"lic_file"`
92+
IgnoreFiles []string `yaml:"ignore_files,omitempty"`
93+
Years string `yaml:"-"`
8594
}
8695

8796
func (l *License) Default() {

0 commit comments

Comments
 (0)