From 9e12c70be6c85a9de7fff991e2c2d6574fd6173d Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Wed, 9 Feb 2022 09:58:40 -0700
Subject: [PATCH] fix: fix tarball packing in paths with spaces (#825) (#826)

Co-authored-by: Tim Perry <pimterry@gmail.com>
---
 src/tarballs/build.ts | 4 ++--
 src/tarballs/node.ts  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tarballs/build.ts b/src/tarballs/build.ts
index 5bf07109..1a07f58a 100644
--- a/src/tarballs/build.ts
+++ b/src/tarballs/build.ts
@@ -17,7 +17,7 @@ const pack = async (from: string, to: string) => {
   log(`packing tarball from ${qq.prettifyPaths(from)} to ${qq.prettifyPaths(to)}`)
   await (to.endsWith('gz') ?
     qq.x('tar', ['czf', to, path.basename(from)]) :
-    qq.x(`tar c ${path.basename(from)} | xz > ${to}`))
+    qq.x(`tar c "${path.basename(from)}" | xz > "${to}"`))
   qq.cd(prevCwd)
 }
 
@@ -39,7 +39,7 @@ export async function build(c: BuildConfig, options: {
     tarball = path.basename(tarball)
     tarball = qq.join([c.workspace(), tarball])
     qq.cd(c.workspace())
-    await qq.x(`tar -xzf ${tarball}`)
+    await qq.x(`tar -xzf "${tarball}"`)
     // eslint-disable-next-line no-await-in-loop
     for (const f of await qq.ls('package', {fullpath: true})) await qq.mv(f, '.')
     await qq.rm('package', tarball, 'bin/run.cmd')
diff --git a/src/tarballs/node.ts b/src/tarballs/node.ts
index 93178641..6707aa21 100644
--- a/src/tarballs/node.ts
+++ b/src/tarballs/node.ts
@@ -47,7 +47,7 @@ export async function fetchNodeBinary({nodeVersion, output, platform, arch, tmp}
     const basedir = path.dirname(tarball)
     await qq.mkdirp(basedir)
     await qq.download(url, tarball)
-    await qq.x(`grep ${path.basename(tarball)} ${shasums} | shasum -a 256 -c -`, {cwd: basedir})
+    await qq.x(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, {cwd: basedir})
   }
 
   const extract = async () => {
@@ -58,11 +58,11 @@ export async function fetchNodeBinary({nodeVersion, output, platform, arch, tmp}
     await qq.mkdirp(path.dirname(cache))
     if (platform === 'win32') {
       qq.pushd(nodeTmp)
-      await qq.x(`7z x -bd -y ${tarball} > /dev/null`)
+      await qq.x(`7z x -bd -y "${tarball}" > /dev/null`)
       await qq.mv([nodeBase, 'node.exe'], cache)
       qq.popd()
     } else {
-      await qq.x(`tar -C ${tmp}/node -xJf ${tarball}`)
+      await qq.x(`tar -C "${tmp}/node" -xJf "${tarball}"`)
       await qq.mv([nodeTmp, nodeBase, 'bin/node'], cache)
     }
   }