Skip to content

Commit f5330c1

Browse files
committed
fix bad merge conflict in rebasing
1 parent 1b7882b commit f5330c1

1 file changed

Lines changed: 9 additions & 19 deletions

File tree

src/command/render/project.ts

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,8 @@ async function runScripts(
968968
options?: RunHandlerOptions,
969969
) => {
970970
return await execProcess({
971-
cmd: [script, ...args],
971+
cmd: script,
972+
args: args,
972973
cwd: options?.cwd,
973974
stdout: options?.stdout,
974975
env: options?.env,
@@ -985,24 +986,13 @@ async function runScripts(
985986
env["QUARTO_USE_FILE_FOR_PROJECT_OUTPUT_FILES"] = output;
986987
}
987988

988-
const result = await handler.run(script, args.splice(1), undefined, {
989-
cwd: projDir,
990-
stdout: quiet ? "piped" : "inherit",
991-
env,
992-
});
993-
if (!result.success) {
994-
throw new Error();
995-
}
996-
} else {
997-
const result = await execProcess({
998-
cmd: args,
999-
cwd: projDir,
1000-
stdout: quiet ? "piped" : "inherit",
1001-
env,
1002-
});
1003-
if (!result.success) {
1004-
throw new Error();
1005-
}
989+
const result = await handler.run(script, args.splice(1), undefined, {
990+
cwd: projDir,
991+
stdout: quiet ? "piped" : "inherit",
992+
env,
993+
});
994+
if (!result.success) {
995+
throw new Error();
1006996
}
1007997
}
1008998
if (scripts.length > 0) {

0 commit comments

Comments
 (0)