fix paths

quarto-dev · Jul 11, 2023 · ded0733 · ded0733
1 parent 6a54f94
commit ded0733
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/package/src/macos/installer.ts b/package/src/macos/installer.ts
@@ -74,6 +74,14 @@ export async function makeInstallerMac(config: Configuration) {
       "entitlements.plist",
     );
 
+    // Sign these non-binary files and don't include
+    // the entitlements declaration
+    const signWithoutEntitlements: string[] = [
+      join(config.directoryInfo.pkgWorking.bin, "quarto.js"),
+      join(config.directoryInfo.pkgWorking.bin, "quarto"),
+    ];
+
+
     // Sign these executable / binary files
     // and include our entitlements declaration
     const signWithEntitlements: string[] = [];
@@ -85,14 +93,16 @@ export async function makeInstallerMac(config: Configuration) {
         "deno",
       ));
 
-      join(
+      signWithEntitlements.push(join(
         config.directoryInfo.pkgWorking.bin,
         "tools",
         arch,
         "dart-sass",
         "src",
         "dart",
-      );
+      ));
+      signWithoutEntitlements.push(join(config.directoryInfo.pkgWorking.bin, "tools", arch, "dart-sass", "sass"));
+
       signWithEntitlements.push(join(config.directoryInfo.pkgWorking.bin, "tools", arch, "esbuild"));
       signWithEntitlements.push(join(config.directoryInfo.pkgWorking.bin, "tools", arch, "pandoc"));
       signWithEntitlements.push(join(config.directoryInfo.pkgWorking.bin, "tools", arch, "typst"));
@@ -110,13 +120,6 @@ export async function makeInstallerMac(config: Configuration) {
     });
 
 
-    // Sign these non-binary files and don't include
-    // the entitlements declaration
-    const signWithoutEntitlements: string[] = [
-      join(config.directoryInfo.pkgWorking.bin, "tools", arch, "dart-sass", "sass"),
-      join(config.directoryInfo.pkgWorking.bin, "quarto.js"),
-      join(config.directoryInfo.pkgWorking.bin, "quarto"),
-    ];
 
     for (const fileToSign of signWithEntitlements) {
       info(fileToSign);

diff --git a/package/src/windows/installer.ts b/package/src/windows/installer.ts
@@ -66,7 +66,7 @@ export async function makeInstallerWindows(configuration: Configuration) {
   const tempDir = Deno.makeTempDirSync();
   const workingDistPath = join(tempDir, "dist");
   const workingBinPath = join(workingDistPath, "bin");
-  const workingToolsPath = join(workingBinPath, "tools");
+  const workingToolsPath = join(workingBinPath, "tools", "x86_64");
   copySync(configuration.directoryInfo.pkgWorking.root, workingDistPath);
 
   if (sign) {