aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-21 16:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

use SIGNAL_CLI_CONFIG_DIR env variable in jsonrpc2-helper script

Browse Source 
* do not hardcode path, but use path specified by SIGNAL_CLI_CONFIG_DIR
  env variable.
This commit is contained in:
Bernhard B
2021-11-01 10:55:07 +01:00
parent ee6ef0b842
commit 2d80ff91a2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/scripts/jsonrpc2-helper.go
View File

@@ -1,7 +1,6 @@
package main package main
import ( import (
"flag"
"fmt" "fmt"
"github.com/bbernhard/signal-cli-rest-api/utils" "github.com/bbernhard/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -31,9 +30,18 @@ stdout_logfile_backups=10
numprocs=1 numprocs=1
` `
func main() { func main() {
signalCliConfigDir := flag.String("signal-cli-config-dir", "/home/.local/share/signal-cli/", "Path to signal-cli config directory") signalCliConfigDir := "/home/.local/share/signal-cli/"
signalCliConfigDataDir := *signalCliConfigDir + "data" signalCliConfigDirEnv := utils.GetEnv("SIGNAL_CLI_CONFIG_DIR", "")
if signalCliConfigDirEnv != "" {
signalCliConfigDir = signalCliConfigDirEnv
if !strings.HasSuffix(signalCliConfigDirEnv, "/") {
signalCliConfigDir += "/"
}
}
signalCliConfigDataDir := signalCliConfigDir + "data"
jsonRpc2ClientConfig := utils.NewJsonRpc2ClientConfig() jsonRpc2ClientConfig := utils.NewJsonRpc2ClientConfig()
@@ -94,7 +102,7 @@ func main() {
} }
// write jsonrpc.yml config file // write jsonrpc.yml config file
err = jsonRpc2ClientConfig.Persist(*signalCliConfigDir + "jsonrpc2.yml") err = jsonRpc2ClientConfig.Persist(signalCliConfigDir + "jsonrpc2.yml")
if err != nil { if err != nil {
log.Fatal("Couldn't persist jsonrpc2.yaml: ", err.Error()) log.Fatal("Couldn't persist jsonrpc2.yaml: ", err.Error())
} }