consolidate docker image commands for prereqs

mocaccinoOS · Aug 2, 2023 · 6048553 · 6048553
1 parent 6e1edfd
commit 6048553
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/templates/build.yaml b/packages/templates/build.yaml
@@ -30,13 +30,16 @@ prelude:
 
 {{/* debug */}}
 {{/* depends on which comes first out of the below debug functions, only the first one will be executed */}}
-{{/* if eq .Values.name "openvdb" }}
+{{/* if eq .Values.name "blender" }}
+{{ template "cr.dump" ( include "cr.merge_shell_commands" ( include "cr.prereqs" ( list .Values $packages "" ) ) ) }}
 {{ template "cr.dumpList" ( include "cr.prereqs" ( list .Values $packages "" ) ) }}
 {{ include "cr.dumpJson" ( get ( ( printf "debug:\n %s" ( include "cr.prereqs" ( list .Values $packages "" ) ) ) | fromYaml ) "debug" ) }}
 {{ end */}}
 {{/* end debug */}}
 
-{{ include "cr.prereqs" ( list .Values $packages "" ) }}
+{{ $prereqs := include "cr.prereqs" ( list .Values $packages "" ) }}
+- |
+{{ ( include "cr.merge_shell_commands" $prereqs ) | indent 2 }}
 
 {{ if eq .Values.category "layerbase" }}
 - |
@@ -48,7 +51,7 @@ prelude:
 
 {{/* debug */}}
 {{/* depends on which comes first out of the below debug functions, only the first one will be executed */}}
-{{/* if eq .Values.name "haskell" }}
+{{/* if eq .Values.name "blender" }}
 {{ template "cr.dumpList" ( include "cr.package_setup" .Values ) }}
 {{ include "cr.dumpJson" ( get ( ( printf "debug:\n %s" ( include "cr.package_setup" .Values ) ) | fromYaml ) "debug" ) }}
 {{ end */}}

diff --git a/packages/templates/functions.yaml b/packages/templates/functions.yaml
@@ -444,6 +444,22 @@
 
 {{- end }}
 
+################################################################################
+## cr.merge_shell_commands ###
+################################################################################
+
+{{- define "cr.merge_shell_commands" }}
+
+{{- $command := "" }}
+{{- range ( get ( ( printf "list:\n %s" . ) | fromYaml ) "list" ) }}
+{{- $command = printf "%s\n%s; \\" $command ( trimAll "; \n" . ) }}
+{{- end }}
+{{- $command = printf "%s\necho;" $command . }}
+
+{{- $command }}
+
+{{- end }}
+
 ################################################################################
 ## flatten ###
 ################################################################################