From 084cd84f36a1d608541b4aa4e1e95334395d8953 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Wed, 16 Oct 2024 01:38:59 +0900 Subject: app: port app to use the system package This commit does away with almost all baggage left over from the Ego port. Error wrapping also got simplified. All API changes happens to be internal which means no changes to main except renaming of the BaseError type. Signed-off-by: Ophestra Umiker --- internal/app/launch.machinectl.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'internal/app/launch.machinectl.go') diff --git a/internal/app/launch.machinectl.go b/internal/app/launch.machinectl.go index 9fb9ea0b..606fd9d5 100644 --- a/internal/app/launch.machinectl.go +++ b/internal/app/launch.machinectl.go @@ -4,7 +4,6 @@ import ( "os/exec" "strings" - "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/verbose" ) @@ -12,7 +11,7 @@ func (a *app) commandBuilderMachineCtl(shimEnv string) (args []string) { args = make([]string, 0, 9+len(a.seal.sys.bwrap.SetEnv)) // shell --uid=$USER - args = append(args, "shell", "--uid="+a.seal.sys.Username) + args = append(args, "shell", "--uid="+a.seal.sys.user.Username) // --quiet if !verbose.Get() { @@ -49,14 +48,6 @@ func (a *app) commandBuilderMachineCtl(shimEnv string) (args []string) { } innerCommand.WriteString("; ") - // override message bus address if enabled - if a.seal.et.Has(state.EnableDBus) { - innerCommand.WriteString(dbusSessionBusAddress + "=" + "'" + "unix:path=" + a.seal.sys.dbusAddr[0][1] + "' ") - if a.seal.sys.dbusSystem { - innerCommand.WriteString(dbusSystemBusAddress + "=" + "'" + "unix:path=" + a.seal.sys.dbusAddr[1][1] + "' ") - } - } - // launch fortify as shim innerCommand.WriteString("exec " + a.seal.sys.executable + " shim") -- cgit v1.3.1