From 221914111eda7e2f06db1e1af06308bb3dc10644 Mon Sep 17 00:00:00 2001
From: Nathan Rijksen <nathanr@activestate.com>
Date: Tue, 24 Sep 2024 09:13:18 -0700
Subject: [PATCH 1/2] Fix nil pointer panic

---
 pkg/buildplan/artifact.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg/buildplan/artifact.go b/pkg/buildplan/artifact.go
index 8a2c58436e..9bf0745618 100644
--- a/pkg/buildplan/artifact.go
+++ b/pkg/buildplan/artifact.go
@@ -124,11 +124,7 @@ func (a Artifacts) ToIDSlice() []strfmt.UUID {
 func (a Artifacts) ToNameMap() ArtifactNameMap {
 	result := make(map[string]*Artifact, len(a))
 	for _, a := range a {
-		name := a.DisplayName
-		if len(a.Ingredients) == 0 {
-			name = a.Ingredients[0].Name
-		}
-		result[name] = a
+		result[a.Name()] = a
 	}
 	return result
 }

From bfedd74995fd7f8027d941f528e9572add34f62a Mon Sep 17 00:00:00 2001
From: Nathan Rijksen <nathanr@activestate.com>
Date: Tue, 24 Sep 2024 09:45:03 -0700
Subject: [PATCH 2/2] Satisfy check-format

---
 internal/assets/contents/shells/zshrc_global.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/assets/contents/shells/zshrc_global.sh b/internal/assets/contents/shells/zshrc_global.sh
index 9f19cbfbe8..c2cee91028 100644
--- a/internal/assets/contents/shells/zshrc_global.sh
+++ b/internal/assets/contents/shells/zshrc_global.sh
@@ -8,4 +8,4 @@ export {{$K}}="{{$V}}:$PATH"
 {{- else}}
 export {{$K}}="{{$V}}"
 {{- end}}
-{{- end}}
\ No newline at end of file
+{{- end}}