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

added fallback mechanism in case signal-cli-native doesn't exist

Browse Source
This commit is contained in:
Bernhard B
2021-02-19 22:19:43 +01:00
parent 23c6fabf8e
commit 4567210688
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/api.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/h2non/filetype"
log "github.com/sirupsen/logrus"
qrcode "github.com/skip2/go-qrcode"
utils "github.com/bbernhard/signal-cli-rest-api/utils"
)
const signalCliV2GroupError = "Cannot create a V2 group as self does not have a versioned profile"
@@ -319,10 +320,21 @@ func runSignalCli(wait bool, args []string, stdin string) (string, error) {
} else {
log.Debug("*) docker exec -it <container id> /bin/bash")
}
log.Debug("*) su signal-api")
log.Debug("*) signal-cli ", strings.Join(args, " "))
cmd := exec.Command("signal-cli", args...)
signalCliBinary := "signal-cli"
if utils.GetEnv("USE_NATIVE", "0") == "1" {
if utils.GetEnv("SUPPORTS_NATIVE", "0") == "1" {
signalCliBinary = "signal-cli-native"
} else {
log.Error("signal-cli-native is not support on this system...falling back to signal-cli")
signalCliBinary = "signal-cli"
}
}
log.Debug("*) su signal-api")
log.Debug("*) ", signalCliBinary, " ", strings.Join(args, " "))
cmd := exec.Command(signalCliBinary, args...)
if stdin != "" {
cmd.Stdin = strings.NewReader(stdin)
}