PS on win

malice00 · Feb 14, 2025 · 15fa67b · 15fa67b
1 parent d3818be
commit 15fa67b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -1860,12 +1860,16 @@ export async function createJavaBom(path, options) {
       "in",
       gradleRootPath,
     );
-    console.log(`${gradleCmd} ${gradleArguments.join(" ")}`.length)
-    console.log(isWin && `${gradleCmd} ${gradleArguments.join(" ")}`.length > 7500 ? "powershell" : isWin)
+    console.log(`${gradleCmd} ${gradleArguments.join(" ")}`.length);
+    const shell =
+      isWin && `${gradleCmd} ${gradleArguments.join(" ")}`.length > 7500
+        ? "powershell"
+        : isWin;
+    console.log(shell);
     const sresult = spawnSync(gradleCmd, gradleArguments, {
       cwd: gradleRootPath,
       encoding: "utf-8",
-      shell: isWin && `${gradleCmd} ${gradleArguments.join(" ")}`.length > 7500 ? "powershell" : isWin,
+      shell: shell,
       timeout: TIMEOUT_MS,
       maxBuffer: MAX_BUFFER,
     });

diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -3785,11 +3785,15 @@ export function executeParallelGradleProperties(dir, allProjectsStr) {
   );
   console.log("Executing", gradleCmd, gradleArgs.join(" "), "in", dir);
   console.log(`${gradleCmd} ${gradleArgs.join(" ")}`.length);
-  console.log(isWin && `${gradleCmd} ${gradleArgs.join(" ")}`.length > 7500 ? "powershell" : isWin)
+  const shell =
+    isWin && `${gradleCmd} ${gradleArgs.join(" ")}`.length > 7500
+      ? "powershell"
+      : isWin;
+  console.log(shell);
   const result = spawnSync(gradleCmd, gradleArgs, {
     cwd: dir,
     encoding: "utf-8",
-    shell: isWin && `${gradleCmd} ${gradleArgs.join(" ")}`.length > 7500 ? "powershell" : isWin,
+    shell: shell,
     maxBuffer: MAX_BUFFER,
   });
   if (result.status !== 0 || result.error) {