snap,snappy,systemd: %s/\<AppArch\>/SnapArch/g

snap/snapenv/snapenv.go

@@ -67,7 +67,7 @@ func GetBasicSnapEnvVars(desc interface{}) []string {
 		"SNAP_VERSION={{.Version}}",
 		"SNAP_ORIGIN={{.Origin}}",
 		"SNAP_FULLNAME={{.UdevAppName}}",
-		"SNAP_ARCH={{.AppArch}}",
+		"SNAP_ARCH={{.SnapArch}}",
 	})
 }
 

snappy/binaries.go

@@ -91,7 +91,7 @@ ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.Target}} "$@"
 	t := template.Must(template.New("wrapper").Parse(wrapperTemplate))
 	wrapperData := struct {
 		SnapName    string
-		AppArch     string
+		SnapArch    string
 		AppPath     string
 		Version     string
 		UdevAppName string
@@ -103,7 +103,7 @@ ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.Target}} "$@"
 		NewAppVars  string
 	}{
 		SnapName:    m.Name,
-		AppArch:     arch.UbuntuArchitecture(),
+		SnapArch:    arch.UbuntuArchitecture(),
 		AppPath:     pkgPath,
 		Version:     m.Version,
 		UdevAppName: udevPartName,

snappy/utils.go

@@ -52,7 +52,7 @@ func stripGlobalRootDirImpl(dir string) string {
 func makeSnapHookEnv(part *SnapPart) (env []string) {
 	desc := struct {
 		SnapName    string
-		AppArch     string
+		SnapArch    string
 		AppPath     string
 		Version     string
 		UdevAppName string

systemd/systemd.go

@@ -390,7 +390,7 @@ WantedBy={{.ServiceSystemdTarget}}
 		AppTriple            string
 		ServiceSystemdTarget string
 		Origin               string
-		AppArch              string
+		SnapArch             string
 		Home                 string
 		EnvVars              string
 		SocketFileName       string