cmd/app: optional interactive shell

Enabling this unconditionally causes the new configuration prompt to be shown when started from a terminal, and is generally less robust than not reading zshrc unless explicitly required.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/app/app.go

@@ -74,7 +74,7 @@ func parse(id string, base *check.Absolute, r io.Reader) (*hst.Config, error) {
 			Shell:    shell,
 			Home:     home,
 			Path:     shell,
-			Args:     []string{"zsh", "-ic"},
+			Args:     []string{"zsh", "-c"},
 
 			Flags: hst.FCoverRun,
 		},
@@ -108,10 +108,11 @@ func parse(id string, base *check.Absolute, r io.Reader) (*hst.Config, error) {
 	}
 	c.Container.Args = append(c.Container.Args, s.Text(), "")
 
-	var flagGPU, flagSystemBus bool
+	var flagInteractive, flagGPU, flagSystemBus bool
 	flags := map[string]*bool{
-		"gpu":        &flagGPU,
+		"interactive": &flagInteractive,
-		"system_bus": &flagSystemBus,
+		"gpu":         &flagGPU,
+		"system_bus":  &flagSystemBus,
 	}
 
 	for s.Scan() {
@@ -259,6 +260,10 @@ func parse(id string, base *check.Absolute, r io.Reader) (*hst.Config, error) {
 		return nil, err
 	}
 
+	if flagInteractive {
+		c.Container.Args[1] += "i"
+	}
+
 	if flagGPU {
 		c.Container.Filesystem = append(c.Container.Filesystem, []hst.FilesystemConfigJSON{
 			{FilesystemConfig: &hst.FSBind{

cmd/app/app_test.go

@@ -112,7 +112,7 @@ talk com.canonical.Unity
 				Home:     hst.AbsPrivateTmp.Append("home"),
 				Path:     fhs.AbsRoot.Append("bin", "zsh"),
 				Args: []string{
-					"zsh", "-ic",
+					"zsh", "-c",
 					"exec Discord --ozone-platform-hint=wayland",
 					"",
 				},