cmd/app: centralise workdir

This makes the directory structure significantly more manageable.

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

cmd/app/app.go

@@ -100,7 +100,7 @@ func parse(id string, base *check.Absolute, r io.Reader) (*hst.Config, error) {
 		return nil, err
 	} else {
 		c.Identity = v
-		root.Upper = base.Append("template", template, "upper")
+		root.Upper = base.Append("template", template)
 	}
 
 	if err := scanOnce(); err != nil {

cmd/app/app_test.go

@@ -76,7 +76,7 @@ talk com.canonical.Unity
 						Lower: []*check.Absolute{
 							base.Append("initial"),
 						},
-						Upper: base.Append("template", "nonfree", "upper"),
+						Upper: base.Append("template", "nonfree"),
 					}},
 					{FilesystemConfig: &hst.FSBind{
 						Target: hst.AbsPrivateTmp.Append("home"),

cmd/app/main.go

@@ -93,8 +93,8 @@ func main() {
 							{FilesystemConfig: &hst.FSOverlay{
 								Target: fhs.AbsRoot,
 								Lower:  []*check.Absolute{initial},
-								Upper:  template.Append(args[0], "upper"),
-								Work:   template.Append(args[0], "work"),
+								Upper:  template.Append(args[0]),
+								Work:   base.Append("work", args[0]),
 							}},
 							{FilesystemConfig: &hst.FSEphemeral{
 								Target: fhs.AbsTmp,