do a check for existence of the view

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
flux-framework · Jan 26, 2024 · 438bf37 · 438bf37
1 parent 289128a
commit 438bf37
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/flux/templates/components.sh b/pkg/flux/templates/components.sh
@@ -44,7 +44,12 @@ export PATH=$PATH:${viewbin}
 goshare-wait-fs -p ${viewbase}/flux-operator-done.txt {{ if .Spec.Logging.Quiet }}> /dev/null 2>&1{{ end }}
 
 # Copy mount software to /opt/software
-cp -R ${viewbase}/software /opt/software
+# If /opt/software already exists, we need to copy into it
+if [[ -e  "/opt/software" ]]; then
+  cp -R ${viewbase}/software/* /opt/software/
+else
+  cp -R ${viewbase}/software /opt/software
+fi
 {{end}}
 
 {{define "paths"}}