libdragon 12.0.1 → 12.0.2

package/modules/actions/exec.js

@@ -66,22 +66,24 @@ const exec = async (info) => {
   const stdin = new PassThrough();
 
   /** @type {string[]} */
-  const paramsWithConvertedPaths = await Promise.all(
-    parameters.map(async (item) => {
-      if (item.startsWith('-')) {
+  const paramsWithConvertedPaths = (
+    await Promise.all(
+      parameters.map(async (item) => {
+        if (item.startsWith('-')) {
+          return item;
+        }
+        if (
+          item.includes(path.sep) &&
+          ((await fileExists(item)) || (await dirExists(item)))
+        ) {
+          return toPosixPath(
+            path.isAbsolute(item) ? path.relative(process.cwd(), item) : item
+          );
+        }
         return item;
-      }
-      if (
-        item.includes(path.sep) &&
-        ((await fileExists(item)) || (await dirExists(item)))
-      ) {
-        return toPosixPath(
-          path.isAbsolute(item) ? path.relative(process.cwd(), item) : item
-        );
-      }
-      return item;
-    })
-  );
+      })
+    )
+  ).map((param) => `"${param}"`);
 
   /**
    *

package/modules/actions/start.js

@@ -34,12 +34,13 @@ const initContainer = async (libdragonInfo) => {
         'run',
         '-d', // Detached
         '--mount',
-        'type=bind,source=' +
+        '"type=bind,source=' +
           libdragonInfo.root +
           ',target=' +
-          CONTAINER_TARGET_PATH, // Mount files
-        '-w=' + CONTAINER_TARGET_PATH, // Set working directory
-        libdragonInfo.imageName,
+          CONTAINER_TARGET_PATH +
+          '"', // Mount files
+        '"-w=' + CONTAINER_TARGET_PATH + '"', // Set working directory
+        '"' + libdragonInfo.imageName + '"',
         'tail',
         '-f',
         '/dev/null',
@@ -58,16 +59,7 @@ const initContainer = async (libdragonInfo) => {
         '-R',
         `${uid >= 0 ? uid : ''}:${gid >= 0 ? gid : ''}`,
         '/n64_toolchain',
-      ],
-      {
-        userCommand: false,
-        inheritStdin: true,
-        inheritStdout: false,
-        inheritStderr: false,
-        spawnOptions: {
-          shell: true,
-        },
-      }
+      ]
     );
   } catch (e) {
     // Dispose the invalid container, clean and exit

package/modules/helpers.js

@@ -188,6 +188,12 @@ function spawnProcess(
         // Prevent the annoying docker "What's next?" message. It messes up everything.
         DOCKER_CLI_HINTS: 'false',
       },
+      // On macos, we need to run the command in a shell for some docker commands
+      // to work properly. The ones with paths in them probably not working on
+      // macOS. No need to do this on Windows, as it'd now require additional
+      // escaping for the paths.
+      // shell: process.platform === 'darwin',
+      shell: true,
       ...spawnOptions,
     });
 

package/modules/project-info.js

@@ -91,7 +91,7 @@ async function findContainerId(libdragonInfo) {
       '--format',
       '{{.}}{{.ID}}',
       '-f',
-      'volume=' + CONTAINER_TARGET_PATH,
+      '"volume=' + CONTAINER_TARGET_PATH + '"',
     ])
   )
     .split('\n')

package/modules/utils.js

@@ -40,16 +40,7 @@ const installDependencies = async (libdragonInfo) => {
       CONTAINER_TARGET_PATH + '/' + libdragonInfo.vendorDirectory,
       ...dockerHostUserParams(libdragonInfo),
     ],
-    ['/bin/bash', './build.sh'],
-    {
-      userCommand: false,
-      inheritStdin: true,
-      inheritStdout: false,
-      inheritStderr: false,
-      spawnOptions: {
-        shell: true,
-      },
-    }
+    ['/bin/bash', './build.sh']
   );
 };
 
@@ -142,7 +133,7 @@ async function runGit(libdragonInfo, params, options = {}) {
 
   return await spawnProcess(
     'git',
-    ['-C', libdragonInfo.root, ...params],
+    ['-C', '"' + libdragonInfo.root + '"', ...params],
     // Windows git is breaking the TTY somehow - disable TTY for now
     // We are not able to display progress for the initial clone b/c of this
     // Enable progress otherwise.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libdragon",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "description": "This is a docker wrapper for libdragon",
   "main": "index.js",
   "engines": {