libdragon 12.0.1 → 12.0.3

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',
@@ -60,10 +61,6 @@ const initContainer = async (libdragonInfo) => {
         '/n64_toolchain',
       ],
       {
-        userCommand: false,
-        inheritStdin: true,
-        inheritStdout: false,
-        inheritStderr: false,
         spawnOptions: {
           shell: true,
         },

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,
     });
 
@@ -314,6 +320,7 @@ const dockerExec = /** @type {DockerExec} */ (
         ...options,
         spawnOptions: {
           cwd: workDir,
+          shell: false,
           ...options?.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

@@ -42,10 +42,6 @@ const installDependencies = async (libdragonInfo) => {
     ],
     ['/bin/bash', './build.sh'],
     {
-      userCommand: false,
-      inheritStdin: true,
-      inheritStdout: false,
-      inheritStderr: false,
       spawnOptions: {
         shell: true,
       },
@@ -142,7 +138,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.3",
   "description": "This is a docker wrapper for libdragon",
   "main": "index.js",
   "engines": {