Ensure output created console message uses correct path

quarto-dev · Feb 4, 2021 · 604611c · 604611c
1 parent 9878172
commit 604611c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/command/render/latekmk/latexmk.ts b/src/command/render/latekmk/latexmk.ts
@@ -112,7 +112,7 @@ export function quartoLatexmkOutputRecipe(
     };
 
     // run latexmk
-    await generatePdf(mkOptions);
+    const pdfOutput = await generatePdf(mkOptions);
 
     // keep tex if requested
     const compileTex = join(inputDir, output);
@@ -122,17 +122,14 @@ export function quartoLatexmkOutputRecipe(
 
     // copy (or write for stdout) compiled pdf to final output location
     if (finalOutput) {
-      const compilePdf = outputDir
-        ? join(inputDir, outputDir, texStem + ".pdf")
-        : join(inputDir, texStem + ".pdf");
       if (finalOutput === kStdOut) {
-        writeFileToStdout(compilePdf);
-        Deno.removeSync(compilePdf);
+        writeFileToStdout(pdfOutput);
+        Deno.removeSync(pdfOutput);
       } else {
         const outputPdf = expandPath(finalOutput);
 
-        if (normalize(compilePdf) !== normalize(outputPdf)) {
-          Deno.renameSync(compilePdf, outputPdf);
+        if (normalize(pdfOutput) !== normalize(outputPdf)) {
+          Deno.renameSync(pdfOutput, outputPdf);
         }
       }
 
@@ -148,7 +145,7 @@ export function quartoLatexmkOutputRecipe(
 
       return finalOutput;
     } else {
-      return texStem + ".pdf";
+      return pdfOutput;
     }
   };
 

diff --git a/src/command/render/latekmk/pdf.ts b/src/command/render/latekmk/pdf.ts
@@ -29,7 +29,7 @@ import {
 export const kLatexHeaderMessageOptions = { bold: true };
 export const kLatexBodyMessageOptions = { indent: 2 };
 
-export async function generatePdf(mkOptions: LatexmkOptions) {
+export async function generatePdf(mkOptions: LatexmkOptions): Promise<string> {
   if (!mkOptions.quiet) {
     message(
       `runnning ${mkOptions.engine.pdfEngine} - 1`,
@@ -107,6 +107,10 @@ export async function generatePdf(mkOptions: LatexmkOptions) {
   if (!mkOptions.quiet) {
     message("");
   }
+
+  return mkOptions.outputDir
+    ? join(cwd, mkOptions.outputDir, stem + ".pdf")
+    : join(cwd, stem + ".pdf");
 }
 
 // The first pass compilation of the latex with the ability to discover