helper: helper.Helper interface

For upcoming bwrap implementation of helper.Helper

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>

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 {

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