Skip to content

Commit 1ee3b56

Browse files
committed
make it clearer that showing script progress consider also the --quiet option
1 parent af99613 commit 1ee3b56

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/command/render/project.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,10 @@ export async function renderProject(
298298
await ensureGitignore(context.dir);
299299

300300
// determine whether pre and post render steps should show progress
301-
const progress = !!projectRenderConfig.options.progress ||
302-
(projectRenderConfig.filesToRender.length > 1);
301+
const progress = (
302+
!!projectRenderConfig.options.progress ||
303+
(projectRenderConfig.filesToRender.length > 1)
304+
) && !projectRenderConfig.options.flags?.quiet;
303305

304306
// if there is an output dir then remove it if clean is specified
305307
if (
@@ -330,8 +332,7 @@ export async function renderProject(
330332
...(projectRenderConfig.behavior.renderAll
331333
? { QUARTO_PROJECT_RENDER_ALL: "1" }
332334
: {}),
333-
"QUARTO_PROJECT_SCRIPT_PROGRESS":
334-
progress && !projectRenderConfig.options.flags?.quiet ? "1" : "0",
335+
"QUARTO_PROJECT_SCRIPT_PROGRESS": progress ? "1" : "0",
335336
};
336337

337338
// run pre-render step if we are rendering all files
@@ -963,7 +964,7 @@ async function runScripts(
963964
const args = parseShellRunCommand(scripts[i]);
964965
const script = args[0];
965966

966-
if (progress && !quiet) {
967+
if (progress) {
967968
info(colors.bold(colors.blue(`Running script '${script}'`)));
968969
}
969970

0 commit comments

Comments
 (0)