fix: update default exec terminal

aotianwinter · Jan 11, 2021 · 6917bbc · 6917bbc
1 parent 8ecf2a4
commit 6917bbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/renderer/store/task-mixin.js b/src/renderer/store/task-mixin.js
@@ -4,7 +4,6 @@ const fs = require('fs')
 const join = require('path').join
 const archiver = require('archiver')
 const { exec } = require('child_process')
-const os = require('os')
 
 const taskMixin = {
   data () {
@@ -170,17 +169,17 @@ const taskMixin = {
     _runLocalCommand (command, path = '/', taskId) {
       return new Promise((resolve, reject) => {
         this._addTaskLogByTaskId(taskId, `${command} 执行中...`)
-        const terminal = os.type() === 'Windows_NT' ? 'powershell.exe ' : ''
-        exec(terminal + command, { cwd: path }, (error, stdout, stderr) => {
+        exec(command, { cwd: path }, (error, stdout, stderr) => {
           if (error) {
             this._addTaskLogByTaskId(taskId, `${command} 执行发生错误！`, 'error')
             this._addTaskLogByTaskId(taskId, stderr, 'error')
             this._addTaskLogByTaskId(taskId, '请检查远端环境中该命令是否有效！', 'warning')
             reject(error)
+          } else {
+            this._addTaskLogByTaskId(taskId, stdout)
+            this._addTaskLogByTaskId(taskId, `${command} 执行完成！`, 'success')
+            resolve()
           }
-          this._addTaskLogByTaskId(taskId, stdout)
-          this._addTaskLogByTaskId(taskId, `${command} 执行完成！`, 'success')
-          resolve()
         })
       })
     },

diff --git a/src/renderer/views/home/TaskForm.vue b/src/renderer/views/home/TaskForm.vue
@@ -78,7 +78,7 @@
               local build command ( path | command )
               <a-tooltip>
                 <template slot="title">
-                  windows: PowerShell<br />
+                  windows: cmd<br />
                   unix: /bin/sh<br />
                   请确保符合语法要求 不使用无需填写
                 </template>
@@ -93,7 +93,7 @@
               local clean command ( path | command )
               <a-tooltip>
                 <template slot="title">
-                  windows: PowerShell<br />
+                  windows: cmd<br />
                   unix: /bin/sh<br />
                   请确保符合语法要求 不使用无需填写
                 </template>