Ophestra
f5abce9df5
All checks were successful
Test / Create distribution (push) Successful in 34s
Test / Sandbox (push) Successful in 1m51s
Test / Hakurei (push) Successful in 3m18s
Test / Hpkg (push) Successful in 3m41s
Test / Sandbox (race detector) (push) Successful in 4m7s
Test / Hakurei (race detector) (push) Successful in 5m18s
Test / Flake checks (push) Successful in 1m35s
This passes more information allowing for better error handling. This eliminates generic WrapErr from system. Signed-off-by: Ophestra <cat@gensokyo.uk>
41 lines
1.0 KiB
Go
41 lines
1.0 KiB
Go
package system
|
|
|
|
import (
|
|
"hakurei.app/system/internal/xcb"
|
|
)
|
|
|
|
// ChangeHosts appends an X11 ChangeHosts command Op.
|
|
func (sys *I) ChangeHosts(username string) *I {
|
|
sys.lock.Lock()
|
|
defer sys.lock.Unlock()
|
|
|
|
sys.ops = append(sys.ops, XHost(username))
|
|
|
|
return sys
|
|
}
|
|
|
|
type XHost string
|
|
|
|
func (x XHost) Type() Enablement { return EX11 }
|
|
|
|
func (x XHost) apply(*I) error {
|
|
msg.Verbosef("inserting entry %s to X11", x)
|
|
return newOpError("xhost",
|
|
xcb.ChangeHosts(xcb.HostModeInsert, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), false)
|
|
}
|
|
|
|
func (x XHost) revert(_ *I, ec *Criteria) error {
|
|
if ec.hasType(x) {
|
|
msg.Verbosef("deleting entry %s from X11", x)
|
|
return newOpError("xhost",
|
|
xcb.ChangeHosts(xcb.HostModeDelete, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), false)
|
|
} else {
|
|
msg.Verbosef("skipping entry %s in X11", x)
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (x XHost) Is(o Op) bool { x0, ok := o.(XHost); return ok && x == x0 }
|
|
func (x XHost) Path() string { return string(x) }
|
|
func (x XHost) String() string { return string("SI:localuser:" + x) }
|