diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-10-07 15:37:52 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-10-07 15:37:52 +0900 |
| commit | 85407dd3c09ffbc4c102baa90249ded685badd12 (patch) | |
| tree | b4b3cabd25fe317a70c0ea0fcdab555e89f75a47 /dbus | |
| parent | 6a2802cf309fb9758756c56ef05c9354d9cb9003 (diff) | |
helper: helper.Helper interface
For upcoming bwrap implementation of helper.Helper
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus.go | 4 | ||||
| -rw-r--r-- | dbus/run.go | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dbus/dbus.go b/dbus/dbus.go index 7a51d98c..b993d52d 100644 --- a/dbus/dbus.go +++ b/dbus/dbus.go @@ -12,7 +12,7 @@ import ( // Proxy holds references to a xdg-dbus-proxy process, and should never be copied. // Once sealed, configuration changes will no longer be possible and attempting to do so will result in a panic. type Proxy struct { - helper *helper.Helper + helper helper.Helper path string session [2]string @@ -35,7 +35,7 @@ func (p *Proxy) String() string { defer p.lock.RUnlock() if p.helper != nil { - return p.helper.String() + return p.helper.Unwrap().String() } if p.seal != nil { diff --git a/dbus/run.go b/dbus/run.go index da0bbc8d..5e489ba3 100644 --- a/dbus/run.go +++ b/dbus/run.go @@ -27,12 +27,13 @@ func (p *Proxy) Start(ready chan error, output io.Writer) error { } }, ) + cmd := h.Unwrap() // xdg-dbus-proxy does not need to inherit the environment - h.Env = []string{} + cmd.Env = []string{} if output != nil { - h.Stdout = output - h.Stderr = output + cmd.Stdout = output + cmd.Stderr = output } if err := h.StartNotify(ready); err != nil { return err |