fix: repair PowerShell commands and command execution errors

leoli0605 · Mar 6, 2024 · 8d464f2 · 8d464f2
1 parent 4d129fe
commit 8d464f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/packageData.json b/packageData.json
@@ -41,7 +41,7 @@
             "install": {
                 "linux": "sudo apt install docker.io -y && sudo apt install docker-compose -y",
                 "mac": "brew install --cask docker && brew install docker-compose",
-                "windows": "choco install docker-desktop -y && choco install docker-compose -y"
+                "windows": "choco install docker-desktop -y ; choco install docker-compose -y"
             },
             "type": "enable"
         },
@@ -275,7 +275,7 @@
             "install": {
                 "linux": "npm install -g commitizen cz-conventional-changelog conventional-changelog-cli && echo '{\"path\": \"cz-conventional-changelog\"}' > ~/.czrc",
                 "mac": "npm install -g commitizen cz-conventional-changelog conventional-changelog-cli && echo '{\"path\": \"cz-conventional-changelog\"}' > ~/.czrc",
-                "windows": "npm install -g commitizen cz-conventional-changelog conventional-changelog-cli && echo '{\"path\": \"cz-conventional-changelog\"}' | Out-File -Encoding utf8 $HOME\\.czrc"
+                "windows": "npm install -g commitizen cz-conventional-changelog conventional-changelog-cli ; echo '{\"path\": \"cz-conventional-changelog\"}' | Out-File -Encoding utf8 $HOME\\.czrc"
             },
             "type": "enable"
         },

diff --git a/src/cmd_process.js b/src/cmd_process.js
@@ -1,8 +1,8 @@
 import { spawn } from "child_process";
 
-function cmd(command, args) {
+export function cmd(command, args) {
     return new Promise((resolve, reject) => {
-        const process = spawn(command, args, { shell: true });
+        const process = spawn(command, args);
 
         process.stdout.on("data", (data) => {
             console.log(data.toString());
@@ -21,5 +21,3 @@ function cmd(command, args) {
         });
     });
 }
-
-export default { cmd };
diff --git a/src/index.js b/src/index.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 import os from 'os';
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
-import cmd from './cmd_process.js';
+import { cmd } from './cmd_process.js';
 import { selectPackages } from './package_selector.js';
 import PowerShell from './powershell.js';
 
@@ -46,9 +46,9 @@ selectPackages()
             ps.addCommand('refreshenv\n'); // for powershell to refresh environment variables
 
             const psScript = ps.getScripts();
-            fs.writeFileSync(path.join(__dirname, 'scripts.ps1.log'), psScript);
+            // fs.writeFileSync(path.join(__dirname, 'scripts.ps1.log'), psScript);
 
-            const encodedPsScript = Buffer.from(psScript).toString('base64');
+            const encodedPsScript = Buffer.from(psScript, 'utf16le').toString('base64');
             command = 'powershell.exe';
             args = ['-NoProfile', '-EncodedCommand', encodedPsScript];
         } else if (os.platform() === 'darwin') {
@@ -69,10 +69,10 @@ selectPackages()
         console.log(`args: ${args}`);
         cmd(command, args)
             .then(() => {
-                console.log("Success executing scripts");
+                console.log('Success executing scripts');
             })
             .catch((error) => {
-                console.error("Error executing scripts:", error);
+                console.error('Error executing scripts:', error);
             });
     })
     .catch((error) => {