Merge pull request #11539 from quarto-dev/bugfix/improve-11532-fix

Refactor Deno.build.os into RAL, add safeFileMode

Author: cscheid

news/changelog-1.7.md

@@ -1,3 +1,5 @@
 All changes included in 1.7:
 
+## Regression fixes
 
+- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.

package/src/common/config.ts

@@ -10,6 +10,8 @@ import { info } from "../../../src/deno_ral/log.ts";
 
 import { getEnv } from "../util/utils.ts";
 
+import { os as platformOs } from "../../../src/deno_ral/platform.ts"
+
 // The core configuration for the packaging process
 export interface Configuration extends PlatformConfiguration {
   productName: string;
@@ -87,7 +89,7 @@ export function readConfiguration(
 
 
 
-  const cmdOs = os || getEnv("QUARTO_OS", Deno.build.os);
+  const cmdOs = os || getEnv("QUARTO_OS", platformOs);
   if (!kValidOS.includes(cmdOs)) {
     throw new Error(
       `Invalid OS ${os} provided. Please use one of ${kValidOS.join(",")}`,

package/src/common/configure.ts

@@ -20,6 +20,7 @@ import {
 } from "./dependencies/dependencies.ts";
 import { suggestUserBinPaths } from "../../../src/core/path.ts";
 import { buildQuartoPreviewJs } from "../../../src/core/previewjs.ts";
+import { isWindows } from "../../../src/deno_ral/platform.ts";
 
 export async function configure(
   config: Configuration,
@@ -160,7 +161,7 @@ export function copyPandocScript(config: Configuration, targetDir: string) {
     Deno.removeSync(pandocFile);
   }
 
-  if (Deno.build.os !== "windows") {
+  if (!isWindows) {
     info("> creating pandoc symlink");
     Deno.run({
       cwd: targetDir,

package/src/util/deno.ts

@@ -5,6 +5,7 @@
 *
 */
 import { info } from "../../../src/deno_ral/log.ts";
+import { isWindows } from "../../../src/deno_ral/platform.ts";
 import { Configuration } from "../common/config.ts";
 
 export async function bundle(
@@ -132,7 +133,7 @@ export function updateDenoPath(installPath: string, _config: Configuration) {
     if (!denoExecPath) {
       throw Error("QUARTO_DENO is not defined");
     }
-    const finalTxt = Deno.build.os === "windows"
+    const finalTxt = isWindows
       ? installTxt.replace(
         /deno.exe /g,
         denoExecPath + " ",

package/src/util/utils.ts

@@ -1,5 +1,6 @@
 import { writeAll } from "io/write-all";
 import { CmdResult, runCmd } from "./cmd.ts";
+import { isWindows } from "../../../src/deno_ral/platform.ts";
 
 // Read an environment variable
 export function getEnv(name: string, defaultValue?: string) {
@@ -31,7 +32,7 @@ export async function unzip(
   zipFile: string,
   dest: string,
 ): Promise<CmdResult> {
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     return await runCmd("PowerShell", [
       "Expand-Archive",
       "-Path",

src/command/check/check.ts

@@ -46,6 +46,7 @@ import { dirname } from "../../deno_ral/path.ts";
 import { notebookContext } from "../../render/notebook/notebook-context.ts";
 import { typstBinaryPath } from "../../core/typst.ts";
 import { quartoCacheDir } from "../../core/appdirs.ts";
+import { isWindows } from "../../deno_ral/platform.ts";
 
 const kIndent = "      ";
 
@@ -176,7 +177,7 @@ async function checkInstall(services: RenderServices) {
     }
   }
   info(`${kIndent}Path: ${quartoConfig.binPath()}`);
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     try {
       const codePage = readCodePage();
       clearCodePageCache();

src/command/create/editor.ts

@@ -15,6 +15,7 @@ import {
 
 import { basename, dirname, join } from "../../deno_ral/path.ts";
 import { existsSync } from "../../deno_ral/fs.ts";
+import { isMac, isWindows } from "../../deno_ral/platform.ts";
 
 export interface Editor {
   // A short, command line friendly id
@@ -104,7 +105,7 @@ function vscodeEditorInfo(): EditorInfo {
     actions: [],
   };
 
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     editorInfo.actions.push({
       action: "which",
       arg: "code.exe",
@@ -118,7 +119,7 @@ function vscodeEditorInfo(): EditorInfo {
       },
     );
     editorInfo.actions.push(...pathActions);
-  } else if (Deno.build.os === "darwin") {
+  } else if (isMac) {
     editorInfo.actions.push({
       action: "which",
       arg: "code",
@@ -168,7 +169,7 @@ function positronEditorInfo(): EditorInfo {
     actions: [],
   };
 
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     editorInfo.actions.push({
       action: "which",
       arg: "Positron.exe",
@@ -182,7 +183,7 @@ function positronEditorInfo(): EditorInfo {
       },
     );
     editorInfo.actions.push(...pathActions);
-  } else if (Deno.build.os === "darwin") {
+  } else if (isMac) {
     editorInfo.actions.push({
       action: "which",
       arg: "positron",
@@ -223,7 +224,7 @@ function rstudioEditorInfo(): EditorInfo {
         const rProjPath = join(cwd, `${artifactName}.Rproj`);
         Deno.writeTextFileSync(rProjPath, kRProjContents);
 
-        const cmd = path.endsWith(".app") && Deno.build.os === "darwin"
+        const cmd = path.endsWith(".app") && isMac
           ? ["open", "-na", path, "--args", rProjPath]
           : [path, rProjPath];
 
@@ -239,7 +240,7 @@ function rstudioEditorInfo(): EditorInfo {
   };
 
   const rstudioExe = "rstudio.exe";
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     editorInfo.actions.push({
       action: "env",
       arg: "RS_RPOSTBACK_PATH",
@@ -257,7 +258,7 @@ function rstudioEditorInfo(): EditorInfo {
       },
     );
     editorInfo.actions.push(...paths);
-  } else if (Deno.build.os === "darwin") {
+  } else if (isMac) {
     const paths = macosAppPaths("RStudio.app").map((path) => {
       return {
         action: "path",

src/command/render/filters.ts

@@ -92,6 +92,7 @@ import { shortUuid } from "../../core/uuid.ts";
 import { isServerShinyPython } from "../../core/render.ts";
 import { pythonExec } from "../../core/jupyter/exec.ts";
 import { kTocIndent } from "../../config/constants.ts";
+import { isWindows } from "../../deno_ral/platform.ts";
 
 const kQuartoParams = "quarto-params";
 
@@ -700,7 +701,7 @@ async function extensionShortcodes(options: PandocOptions) {
 
 function initFilterParams(dependenciesFile: string) {
   const params: Metadata = {};
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     const value = readCodePage();
     if (value) {
       debug("Windows: Using code page " + value);

src/command/render/latexmk/pdf.ts

@@ -26,6 +26,7 @@ import {
 } from "./parse-error.ts";
 import { error, info, warning } from "../../../deno_ral/log.ts";
 import { logProgress } from "../../../core/log.ts";
+import { isWindows } from "../../../deno_ral/platform.ts";
 
 export async function generatePdf(mkOptions: LatexmkOptions): Promise<string> {
   if (!mkOptions.quiet) {
@@ -369,7 +370,7 @@ async function makeBibliographyIntermediates(
         // If we're on windows and auto-install isn't enabled,
         // fix up the aux file
         //
-        if (Deno.build.os === "windows") {
+        if (isWindows) {
           if (bibCommand !== "biber" && !hasTexLive()) {
             // See https://github.com/rstudio/tinytex/blob/b2d1bae772f3f979e77fca9fb5efda05855b39d2/R/latex.R#L284
             // Strips the '.bib' from any match and returns the string without the bib extension

src/command/render/latexmk/texlive.ts

@@ -11,6 +11,7 @@ import { requireQuoting, safeWindowsExec } from "../../../core/windows.ts";
 import { hasTinyTex, tinyTexBinDir } from "../../../tools/impl/tinytex-info.ts";
 import { join } from "../../../deno_ral/path.ts";
 import { logProgress } from "../../../core/log.ts";
+import { isWindows } from "../../../deno_ral/platform.ts";
 
 export interface TexLiveContext {
   preferTinyTex: boolean;
@@ -438,7 +439,7 @@ function tlmgrCommand(
 
   // On windows, we always want to call tlmgr through the 'safe'
   // cmd /c approach since it is a bat file
-  if (Deno.build.os === "windows") {
+  if (isWindows) {
     const quoted = requireQuoting(args);
     return safeWindowsExec(
       tlmgr.fullPath,