diff --git a/config/go.mod b/config/go.mod index 4476044..d08f1ae 100644 --- a/config/go.mod +++ b/config/go.mod @@ -1,4 +1,4 @@ -module gitea.meta-tech.academy/core/config +module gitea.meta-tech.academy/go/core/config go 1.20 diff --git a/config/loader.go b/config/loader.go index d8af616..1b77489 100644 --- a/config/loader.go +++ b/config/loader.go @@ -6,9 +6,14 @@ import ( "regexp" "strings" + "gitea.meta-tech.academy/go/core/sys" "gopkg.in/yaml.v3" ) +func tutu() { + sys.RunShellCmd("ls -la") +} + type Cfg interface { GetVar() []VarConfig } @@ -39,6 +44,7 @@ func LoadConfig(path string, out Cfg, varPattern *VarPattern) { cl.parse() cl.refstr = []*reflect.Value{} // cl.setConfigPtr(outi) + tutu() } func (cl *ConfigLoader) findVarName(match string) string { diff --git a/go.work.sum b/go.work.sum index 8a453e6..a26dab9 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,3 +1,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= +github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= +github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= diff --git a/style/go.mod b/style/go.mod index dde5d97..0548c10 100644 --- a/style/go.mod +++ b/style/go.mod @@ -1,10 +1,13 @@ -module gitea.meta-tech.academy/core/style +module gitea.meta-tech.academy/go/core/style go 1.20 -require github.com/gookit/color v1.5.4 +require ( + gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956 + github.com/gookit/color v1.5.4 +) require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect - golang.org/x/sys v0.13.0 // indirect + golang.org/x/sys v0.10.0 // indirect ) diff --git a/style/go.sum b/style/go.sum index 08bc284..5cb28be 100644 --- a/style/go.sum +++ b/style/go.sum @@ -1,3 +1,5 @@ +gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956 h1:XxyPD/jBTPqrf2o1N3QRmw8fPgvP7G9Z9Ba3DgH/Uz0= +gitea.meta-tech.academy/go/core/util v0.0.0-20231102220428-c719e245b956/go.mod h1:q+p8vM+aQ36GVspuTTupRBNDUKrsXCccx4k3f7IKfx8= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= @@ -5,5 +7,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/style/style.go b/style/style.go index e3a0506..8901280 100644 --- a/style/style.go +++ b/style/style.go @@ -3,7 +3,7 @@ package style import ( "fmt" "strings" - + "gitea.meta-tech.academy/go/core/util" "github.com/gookit/color" ) diff --git a/sys/go.mod b/sys/go.mod index ba3d5d5..68324f2 100644 --- a/sys/go.mod +++ b/sys/go.mod @@ -1,4 +1,4 @@ -module gitea.meta-tech.academy/core/sys +module gitea.meta-tech.academy/go/core/sys go 1.20 diff --git a/util/go.mod b/util/go.mod index 1d1823f..093c216 100644 --- a/util/go.mod +++ b/util/go.mod @@ -1,3 +1,3 @@ -module gitea.meta-tech.academy/core/util +module gitea.meta-tech.academy/go/core/util go 1.20