libdragon 12.0.3 → 12.0.4

package/modules/actions/start.js

@@ -34,13 +34,12 @@ 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',
@@ -59,12 +58,7 @@ const initContainer = async (libdragonInfo) => {
         '-R',
         `${uid >= 0 ? uid : ''}:${gid >= 0 ? gid : ''}`,
         '/n64_toolchain',
-      ],
-      {
-        spawnOptions: {
-          shell: true,
-        },
-      }
+      ]
     );
   } catch (e) {
     // Dispose the invalid container, clean and exit

package/modules/helpers.js

@@ -124,12 +124,11 @@ async function dirExists(path) {
  * }} SpawnOptions
  */
 
+// A simple Promise wrapper for child_process.spawn. Return the err/out streams
+// from the process by default. Specify inheritStdout / inheritStderr to disable
+// this and inherit the parent process's stream, passing through the TTY if any.
 /**
- * A simple Promise wrapper for child_process.spawn. Return the err/out streams
- * from the process by default. Specify inheritStdout / inheritStderr to disable
- * this and inherit the parent process's stream, passing through the TTY if any.
- * Runs everything in a shell, so be careful with user input. By default, we get
- * the input from user but this is the whole idea of most of the logic here.
+ *
  * @param {string} cmd
  * @param {string[]} params
  * @param {SpawnOptions} options
@@ -185,15 +184,10 @@ function spawnProcess(
         enableErrorTTY ? 'inherit' : 'pipe',
       ],
       env: {
+        ...process.env,
         // 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,
     });
 
@@ -320,7 +314,6 @@ const dockerExec = /** @type {DockerExec} */ (
         ...options,
         spawnOptions: {
           cwd: workDir,
-          shell: false,
           ...options?.spawnOptions,
         },
       });

package/modules/npm-utils.js

@@ -21,7 +21,16 @@ async function findNPMRoot() {
 function runNPM(params) {
   return spawnProcess(
     /^win/.test(process.platform) ? 'npm.cmd' : 'npm',
-    params
+    params,
+    {
+      userCommand: false,
+      inheritStdin: true,
+      inheritStdout: false,
+      inheritStderr: false,
+      spawnOptions: {
+        shell: true,
+      },
+    }
   );
 }
 module.exports = {

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,12 +40,7 @@ const installDependencies = async (libdragonInfo) => {
       CONTAINER_TARGET_PATH + '/' + libdragonInfo.vendorDirectory,
       ...dockerHostUserParams(libdragonInfo),
     ],
-    ['/bin/bash', './build.sh'],
-    {
-      spawnOptions: {
-        shell: true,
-      },
-    }
+    ['/bin/bash', './build.sh']
   );
 };
 
@@ -138,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.3",
+  "version": "12.0.4",
   "description": "This is a docker wrapper for libdragon",
   "main": "index.js",
   "engines": {