restore original timed comamand

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
flux-framework · Mar 11, 2023 · 06aa1f2 · 06aa1f2
1 parent e529d1e
commit 06aa1f2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/controllers/flux/templates/wait.sh b/controllers/flux/templates/wait.sh
@@ -273,11 +273,10 @@ else
             printf "\n🌀 Submit Mode: flux start -o --config /etc/flux/config ${brokerOptions} flux submit {{ if ge .Tasks .Size }} -N {{.Size}}{{ end }} -n {{.Tasks}} --quiet {{ if .Container.FluxOptionFlags }}{{ .Container.FluxOptionFlags}}{{ end }} --watch{{ if .Logging.Debug }} -vvv{{ end }} $@\n"
             {{ end }}
 {{ end }}
-            prefix="{{ if .Logging.Timed }}/usr/bin/time -f \"FLUXTIME fluxstart wall time %E\" {{ end }}${asFlux} flux start -o --config /etc/flux/config ${brokerOptions} {{ if .Logging.Timed }}/usr/bin/time -f \"FLUXTIME fluxsubmit wall time %E\" {{ end }}"
             {{ if .Container.Launcher }}
-            $prefix $@
+            {{ if .Logging.Timed }}/usr/bin/time -f "FLUXTIME fluxstart wall time %E" {{ end }}${asFlux} flux start -o --config /etc/flux/config ${brokerOptions} {{ if .Logging.Timed }}/usr/bin/time -f "FLUXTIME fluxsubmit wall time %E" {{ end }} $@
             {{ else }}
-            $prefix flux submit {{ if ge .Tasks .Size }} -N {{.Size}}{{ end }} -n {{.Tasks}} --quiet {{ if .Container.FluxOptionFlags }}{{ .Container.FluxOptionFlags}}{{ end }} --watch{{ if .Logging.Debug }} -vvv{{ end }} $@
+            {{ if .Logging.Timed }}/usr/bin/time -f "FLUXTIME fluxstart wall time %E" {{ end }}${asFlux} flux start -o --config /etc/flux/config ${brokerOptions} {{ if .Logging.Timed }}/usr/bin/time -f "FLUXTIME fluxsubmit wall time %E" {{ end }} flux submit {{ if ge .Tasks .Size }} -N {{.Size}}{{ end }} -n {{.Tasks}} --quiet {{ if .Container.FluxOptionFlags }}{{ .Container.FluxOptionFlags}}{{ end }} --watch{{ if .Logging.Debug }} -vvv{{ end }} $@
             {{ end }}
         fi
     else