idk/i2p.plugin.native
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include os and arch in

Browse Source
This commit is contained in:
eyedeekay
2024-09-20 20:11:26 -04:00
parent 87ac74ae44
commit b963c19eb6
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client-config.go
View File

@ -200,10 +200,10 @@ func (cc *ClientConfig) CopyExecutable() error {
}
func (cc *ClientConfig) Load() error {
if _, err := os.Stat("client.yaml"); os.IsNotExist(err) {
if _, err := os.Stat(clientFile()); os.IsNotExist(err) {
return nil
}
yamlFile, err := ioutil.ReadFile("client.yaml")
yamlFile, err := ioutil.ReadFile(clientFile())
if err != nil {
return err
}
@ -215,7 +215,7 @@ func (cc *ClientConfig) Save() error {
if err != nil {
fmt.Println(err)
}
return ioutil.WriteFile("client.yaml", bytes, 0644)
return ioutil.WriteFile(clientFile(), bytes, 0644)
}
func find(root, ext string) []string {
@ -235,3 +235,16 @@ func find(root, ext string) []string {
func Copy(src, dst string) error {
return copy.Copy(src, dst)
}
func clientFile() string {
goos := os.Getenv("GOOS")
goarch := os.Getenv("GOARCH")
r := "client"
if goos != "" {
r += "-" + goos
}
if goarch != "" {
r += "-" + goarch
}
return r + ".yaml"
}

19
plugin-config.go
View File

@ -301,10 +301,10 @@ func (pc *PluginConfig) keysPath(path string) (string, error) {
}
func (cc *PluginConfig) Load() error {
if _, err := os.Stat("plugin.yaml"); os.IsNotExist(err) {
if _, err := os.Stat(pluginFile()); os.IsNotExist(err) {
return nil
}
yamlFile, err := ioutil.ReadFile("plugin.yaml")
yamlFile, err := ioutil.ReadFile(pluginFile())
if err != nil {
return err
}
@ -316,5 +316,18 @@ func (pc *PluginConfig) Save() {
if err != nil {
fmt.Println(err)
}
ioutil.WriteFile("plugin.yaml", bytes, 0644)
ioutil.WriteFile(pluginFile(), bytes, 0644)
}
func pluginFile() string {
goos := os.Getenv("GOOS")
goarch := os.Getenv("GOARCH")
r := "plugin"
if goos != "" {
r += "-" + goos
}
if goarch != "" {
r += "-" + goarch
}
return r + ".yaml"
}