diff options
| -rw-r--r-- | cli.go | 1 | ||||
| -rw-r--r-- | internal/app/run.go | 20 |
2 files changed, 8 insertions, 13 deletions
@@ -28,7 +28,6 @@ func init() { flag.BoolVar(&app.LaunchOptions[app.LaunchMethodSudo], "sudo", false, "Use 'sudo' to switch user") flag.BoolVar(&app.LaunchOptions[app.LaunchMethodMachineCtl], "machinectl", true, "Use 'machinectl' to switch user") - flag.BoolVar(&app.LaunchOptions[app.LaunchBare], "bare", false, "Only set environment variables for child") flag.BoolVar(&flagVerbose, "v", false, "Verbose output") flag.BoolVar(&printVersion, "V", false, "Print version") diff --git a/internal/app/run.go b/internal/app/run.go index bd3bd9bf..46e0270d 100644 --- a/internal/app/run.go +++ b/internal/app/run.go @@ -20,7 +20,6 @@ const ( LaunchMethodSudo = iota LaunchMethodMachineCtl - LaunchBare launchOptionLength ) @@ -59,10 +58,10 @@ func (a *App) Run() { } if system.V.Verbose { - fmt.Printf("Selected launcher '%s' bare=%t\n", toolPath, LaunchOptions[LaunchBare]) + fmt.Printf("Selected launcher '%s'\n", toolPath) } - cmd := exec.Command(toolPath, commandBuilder(LaunchOptions[LaunchBare])...) + cmd := exec.Command(toolPath, commandBuilder()...) cmd.Env = a.env cmd.Stdin = os.Stdin cmd.Stdout = os.Stdout @@ -99,7 +98,7 @@ func (a *App) Run() { os.Exit(r) } -func (a *App) commandBuilderSudo(bare bool) (args []string) { +func (a *App) commandBuilderSudo() (args []string) { args = make([]string, 0, 4+len(a.env)+len(a.command)) // -Hiu $USER @@ -123,7 +122,7 @@ func (a *App) commandBuilderSudo(bare bool) (args []string) { return } -func (a *App) commandBuilderMachineCtl(bare bool) (args []string) { +func (a *App) commandBuilderMachineCtl() (args []string) { args = make([]string, 0, 9+len(a.env)) // shell --uid=$USER @@ -158,14 +157,11 @@ func (a *App) commandBuilderMachineCtl(bare bool) (args []string) { innerCommand := strings.Builder{} - if !bare { - innerCommand.WriteString("dbus-update-activation-environment --systemd") - for _, e := range a.env { - innerCommand.WriteString(" " + strings.SplitN(e, "=", 2)[0]) - } - innerCommand.WriteString("; ") - //innerCommand.WriteString("systemctl --user start xdg-desktop-portal-gtk; ") + innerCommand.WriteString("dbus-update-activation-environment --systemd") + for _, e := range a.env { + innerCommand.WriteString(" " + strings.SplitN(e, "=", 2)[0]) } + innerCommand.WriteString("; ") if executable, err := os.Executable(); err != nil { state.Fatal("Error reading executable path:", err) |