Ophestra Umiker
62cb8a91b6
There was an earlier attempt of cleaning up the app package however it ended up creating even more of a mess and the code structure largely still looked like Ego with state setup scattered everywhere and a bunch of ugly hacks had to be implemented to keep track of all of them. In this commit the entire app package is rewritten to track everything that has to do with an app in one thread safe value. In anticipation of the client/server split also made changes: - Console messages are cleaned up to be consistent - State tracking is fully rewritten to be cleaner and usable for multiple process and client/server - Encapsulate errors to easier identify type of action causing the error as well as additional info - System-level setup operations is grouped in a way that can be collectively committed/reverted and gracefully handles errors returned by each operation - Resource sharing is made more fine-grained with PID-scoped resources whenever possible, a few remnants (X11, Wayland, PulseAudio) will be addressed when a generic proxy is available - Application setup takes a JSON-friendly config struct and deterministically generates system setup operations Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
package main
|
|
|
|
import (
|
|
"flag"
|
|
|
|
"git.ophivana.moe/cat/fortify/internal"
|
|
)
|
|
|
|
var (
|
|
userName string
|
|
confPath string
|
|
|
|
dbusConfigSession string
|
|
dbusConfigSystem string
|
|
dbusVerbose bool
|
|
dbusID string
|
|
mpris bool
|
|
|
|
mustWayland bool
|
|
mustX bool
|
|
mustDBus bool
|
|
mustPulse bool
|
|
|
|
flagVerbose bool
|
|
printVersion bool
|
|
|
|
launchMethodText string
|
|
)
|
|
|
|
func init() {
|
|
flag.StringVar(&userName, "u", "chronos", "Passwd name of user to run as")
|
|
flag.StringVar(&confPath, "c", "nil", "Path to full app configuration, or \"nil\" to configure from flags")
|
|
|
|
flag.StringVar(&dbusConfigSession, "dbus-config", "builtin", "Path to D-Bus proxy config file, or \"builtin\" for defaults")
|
|
flag.StringVar(&dbusConfigSystem, "dbus-system", "nil", "Path to system D-Bus proxy config file, or \"nil\" to disable")
|
|
flag.BoolVar(&dbusVerbose, "dbus-log", false, "Enable logging in the D-Bus proxy")
|
|
flag.StringVar(&dbusID, "dbus-id", "", "D-Bus ID of application, leave empty to disable own paths, has no effect if custom config is available")
|
|
flag.BoolVar(&mpris, "mpris", false, "Allow owning MPRIS D-Bus path, has no effect if custom config is available")
|
|
|
|
flag.BoolVar(&mustWayland, "wayland", false, "Share Wayland socket")
|
|
flag.BoolVar(&mustX, "X", false, "Share X11 socket and allow connection")
|
|
flag.BoolVar(&mustDBus, "dbus", false, "Proxy D-Bus connection")
|
|
flag.BoolVar(&mustPulse, "pulse", false, "Share PulseAudio socket and cookie")
|
|
|
|
flag.BoolVar(&flagVerbose, "v", false, "Verbose output")
|
|
flag.BoolVar(&printVersion, "V", false, "Print version")
|
|
}
|
|
|
|
func init() {
|
|
methodHelpString := "Method of launching the child process, can be one of \"sudo\", \"bubblewrap\""
|
|
if internal.SdBootedV {
|
|
methodHelpString += ", \"systemd\""
|
|
}
|
|
|
|
flag.StringVar(&launchMethodText, "method", "sudo", methodHelpString)
|
|
}
|