Skip to content

Commit 7fcf2e9

Browse files
bqueninbquenin
committed
updating modules
1 parent cff30e2 commit 7fcf2e9

File tree

3 files changed

+38
-9
lines changed

3 files changed

+38
-9
lines changed

Diff for: ‎cmd/interpreter/configuration/configuration.go

+14-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package configuration
33
import (
44
_ "embed"
55
"os"
6+
"path/filepath"
67
"strings"
78
"time"
89

@@ -32,12 +33,18 @@ type Configuration struct {
3233
}
3334

3435
func Read() (*Configuration, error) {
36+
executable, err := os.Executable()
37+
if err != nil {
38+
return nil, err
39+
}
40+
3541
// Add matching environment variables - will take precedence over config files.
3642
viper.AutomaticEnv()
3743
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
3844
viper.SetEnvPrefix("INTERPRETER")
3945

4046
// Add default config file search paths in order of decreasing precedence.
47+
viper.AddConfigPath(filepath.Dir(executable))
4148
viper.AddConfigPath(".")
4249
viper.AddConfigPath("$HOME")
4350
viper.SetConfigType("yml")
@@ -56,7 +63,13 @@ func Read() (*Configuration, error) {
5663
}
5764

5865
func WriteDefault() error {
59-
return os.WriteFile(ConfigName+".yml", defaultConfiguration, 0644)
66+
executable, err := os.Executable()
67+
if err != nil {
68+
return err
69+
}
70+
71+
configFilePath := filepath.Join(filepath.Dir(executable), ConfigName+".yml")
72+
return os.WriteFile(configFilePath, defaultConfiguration, 0644)
6073
}
6174

6275
// GetRefreshRate returns the refresh rate as duration

Diff for: ‎go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ go 1.18
55
require (
66
cloud.google.com/go/translate v1.2.0
77
cloud.google.com/go/vision v1.2.0
8-
github.com/bquenin/captured v0.0.0-20220710161533-eea8853cd88e
8+
github.com/bquenin/captured v0.0.0-20220718001553-a79764d4941b
99
github.com/hajimehoshi/ebiten/v2 v2.3.6
1010
github.com/k0kubun/pp/v3 v3.1.0
1111
github.com/rs/zerolog v1.27.0
1212
github.com/spf13/viper v1.12.0
1313
golang.org/x/image v0.0.0-20220617043117-41969df76e82
1414
golang.org/x/text v0.3.7
15-
google.golang.org/genproto v0.0.0-20220708155623-50e5f4832e73
15+
google.golang.org/genproto v0.0.0-20220715211116-798f69b842b9
1616
)
1717

1818
require (
1919
cloud.google.com/go v0.103.0 // indirect
2020
cloud.google.com/go/compute v1.7.0 // indirect
2121
github.com/fsnotify/fsnotify v1.5.4 // indirect
22-
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220622232848-a6c407ee30a0 // indirect
22+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220712193148-63cf1f4ef61f // indirect
2323
github.com/gofrs/flock v0.8.1 // indirect
2424
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2525
github.com/golang/protobuf v1.5.2 // indirect
@@ -36,21 +36,21 @@ require (
3636
github.com/mitchellh/mapstructure v1.5.0 // indirect
3737
github.com/pelletier/go-toml v1.9.5 // indirect
3838
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
39-
github.com/spf13/afero v1.8.2 // indirect
39+
github.com/spf13/afero v1.9.0 // indirect
4040
github.com/spf13/cast v1.5.0 // indirect
4141
github.com/spf13/jwalterweatherman v1.1.0 // indirect
4242
github.com/spf13/pflag v1.0.5 // indirect
4343
github.com/subosito/gotenv v1.4.0 // indirect
4444
go.opencensus.io v0.23.0 // indirect
45-
golang.org/x/exp/shiny v0.0.0-20220706164943-b4a6d9510983 // indirect
45+
golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75 // indirect
4646
golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
4747
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
4848
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect
4949
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
50-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d // indirect
51-
google.golang.org/api v0.86.0 // indirect
50+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
51+
google.golang.org/api v0.87.0 // indirect
5252
google.golang.org/appengine v1.6.7 // indirect
53-
google.golang.org/grpc v1.47.0 // indirect
53+
google.golang.org/grpc v1.48.0 // indirect
5454
google.golang.org/protobuf v1.28.0 // indirect
5555
gopkg.in/ini.v1 v1.66.6 // indirect
5656
gopkg.in/yaml.v2 v2.4.0 // indirect

Diff for: ‎go.sum

+16
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
7272
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
7373
github.com/bquenin/captured v0.0.0-20220710161533-eea8853cd88e h1:m1Q4pgPdktGGUF3+6zzaQAkuoKDWNGwiTKdruTPX8tA=
7474
github.com/bquenin/captured v0.0.0-20220710161533-eea8853cd88e/go.mod h1:ZugVNAc5QYnR+1aXXwbJ9n0bZBHFkle9IjJcCV0uTeA=
75+
github.com/bquenin/captured v0.0.0-20220718001553-a79764d4941b h1:QA9NybtpM4URzAXrNTJjvWHZYhA0mH/cL1xPYYxCPBk=
76+
github.com/bquenin/captured v0.0.0-20220718001553-a79764d4941b/go.mod h1:ZugVNAc5QYnR+1aXXwbJ9n0bZBHFkle9IjJcCV0uTeA=
7577
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
7678
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
7779
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -112,6 +114,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
112114
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220320163800-277f93cfa958/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
113115
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220622232848-a6c407ee30a0 h1:ZWsNtyC3mgUL48DikCfjkyiaRYZ3OL2XBfn7JJs2/ZE=
114116
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220622232848-a6c407ee30a0/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
117+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220712193148-63cf1f4ef61f h1:w3h343WgVLKLITcSpwecCDcq0FO8pAv6A/UG86hhFtY=
118+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220712193148-63cf1f4ef61f/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
115119
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
116120
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
117121
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
@@ -264,6 +268,8 @@ github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Q
264268
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
265269
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
266270
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
271+
github.com/spf13/afero v1.9.0 h1:sFSLUHgxdnN32Qy38hK3QkYBFXZj9DKjVjCUCtD7juY=
272+
github.com/spf13/afero v1.9.0/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
267273
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
268274
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
269275
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
@@ -319,6 +325,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
319325
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
320326
golang.org/x/exp/shiny v0.0.0-20220706164943-b4a6d9510983 h1:z34Buq9ijQFAoTegl58EYWYLBAzEDT0BTzglEJ+AmEo=
321327
golang.org/x/exp/shiny v0.0.0-20220706164943-b4a6d9510983/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
328+
golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75 h1:+tvDaVUVC7xUhwmi3B/tvmqManNx24wRIWsXvvnkb8Q=
329+
golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
322330
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
323331
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
324332
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
@@ -507,6 +515,8 @@ golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBc
507515
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
508516
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I=
509517
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
518+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
519+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
510520
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
511521
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
512522
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -626,6 +636,8 @@ google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3p
626636
google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
627637
google.golang.org/api v0.86.0 h1:ZAnyOHQFIuWso1BodVfSaRyffD74T9ERGFa3k1fNk/U=
628638
google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
639+
google.golang.org/api v0.87.0 h1:pUQVF/F+X7Tl1lo4LJoJf5BOpjtmINU80p9XpYTU2p4=
640+
google.golang.org/api v0.87.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
629641
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
630642
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
631643
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -719,6 +731,8 @@ google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljW
719731
google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
720732
google.golang.org/genproto v0.0.0-20220708155623-50e5f4832e73 h1:sdZWfcGN37Dv0QWIhuasQGMzAQJOL2oqnvot4/kPgfQ=
721733
google.golang.org/genproto v0.0.0-20220708155623-50e5f4832e73/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
734+
google.golang.org/genproto v0.0.0-20220715211116-798f69b842b9 h1:1aEQRgZ4Gks2SRAkLzIPpIszRazwVfjSFe1cKc+e0Jg=
735+
google.golang.org/genproto v0.0.0-20220715211116-798f69b842b9/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
722736
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
723737
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
724738
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -751,6 +765,8 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
751765
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
752766
google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
753767
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
768+
google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
769+
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
754770
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
755771
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
756772
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

0 commit comments

Comments
 (0)