c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create the LaunchAgents directory if it does not exist (#237)

Browse Source 
* Create the LaunchAgents directory if it does not exist

Fixes: https://github.com/ooni/probe/issues/1368

* Update cmd/ooniprobe/internal/autorun/autorun_darwin.go

Co-authored-by: Simone Basso <bassosimone@gmail.com>

Co-authored-by: Simone Basso <bassosimone@gmail.com>
This commit is contained in:
Arturo Filastò 2021-03-02 20:24:09 +01:00 committed by GitHub
parent 322394fe63
commit 12e1164940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ooniprobe/internal/autorun/autorun_darwin.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -20,7 +21,8 @@ import (
type managerDarwin struct{} type managerDarwin struct{}
var ( var (
plistPath = os.ExpandEnv("$HOME/Library/LaunchAgents/org.ooni.cli.plist") plistDir = os.ExpandEnv("$HOME/Library/LaunchAgents/")
plistPath = filepath.Join(plistDir, "org.ooni.cli.plist")
domainTarget = fmt.Sprintf("gui/%d", os.Getuid()) domainTarget = fmt.Sprintf("gui/%d", os.Getuid())
serviceTarget = fmt.Sprintf("%s/org.ooni.cli", domainTarget) serviceTarget = fmt.Sprintf("%s/org.ooni.cli", domainTarget)
) )
@ -107,6 +109,10 @@ func (managerDarwin) writePlist() error {
if err := t.Execute(&out, in); err != nil { if err := t.Execute(&out, in); err != nil {
return err return err
} }
log.Infof("exec: mkdir -p %s", plistDir)
if err := os.MkdirAll(plistDir, 0755); err != nil {
return err
}
log.Infof("exec: writePlist(%s)", plistPath) log.Infof("exec: writePlist(%s)", plistPath)
return ioutil.WriteFile(plistPath, out.Bytes(), 0644) return ioutil.WriteFile(plistPath, out.Bytes(), 0644)
} }