Revert "fix: only invoke a shell for docker commands known to cause p…

…roblems on macos" This reverts commit bc88f2e.
anacierdem · Oct 20, 2024 · 8635ac0 · 8635ac0
1 parent 48b9b8f
commit 8635ac0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 24 deletions.
diff --git a/modules/actions/exec.js b/modules/actions/exec.js
@@ -112,10 +112,6 @@ const exec = async (info) => {
           // spawnProcess defaults does not apply to dockerExec so we need to
           // provide these explicitly here.
           inheritStderr: true,
-          spawnOptions: {
-            ...opts.spawnOptions,
-            shell: true,
-          },
           ...opts,
         }
       )

diff --git a/modules/actions/start.js b/modules/actions/start.js
@@ -58,16 +58,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

diff --git a/modules/helpers.js b/modules/helpers.js
@@ -188,6 +188,7 @@ function spawnProcess(
         // Prevent the annoying docker "What's next?" message. It messes up everything.
         DOCKER_CLI_HINTS: 'false',
       },
+      shell: true,
       ...spawnOptions,
     });
 

diff --git a/modules/utils.js b/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']
   );
 };