diff options
| author | ruki <[email protected]> | 2019-12-20 23:59:40 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-12-20 17:58:04 +0800 |
| commit | ec7035398c3ad32ccca6d29b96895864d1802fb2 (patch) | |
| tree | 2d26dfef891c86eb3f81cc55a44b15fbab75fdb3 /xmake/core/base/process.lua | |
| parent | b8ef2fa1fdf5d7dcd2b8d076f479bbfbad1a0738 (diff) | |
hide wait progress info when redirecting
Diffstat (limited to 'xmake/core/base/process.lua')
| -rw-r--r-- | xmake/core/base/process.lua | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/xmake/core/base/process.lua b/xmake/core/base/process.lua index ff8336a6d..65be506a9 100644 --- a/xmake/core/base/process.lua +++ b/xmake/core/base/process.lua @@ -23,6 +23,7 @@ local process = process or {} local _subprocess = _subprocess or {} -- load modules +local io = require("base/io") local path = require("base/path") local utils = require("base/utils") local string = require("base/string") @@ -161,10 +162,15 @@ function process.asyncrun(task, waitchars) -- create a coroutine task task = coroutine.create(task) + -- we need hide wait characters if is not a tty + local show_wait = io.isatty() + -- trace local waitindex = 0 local waitchars = waitchars or {'\\', '-', '/', '|'} - utils.printf(waitchars[waitindex + 1]) + if show_wait then + utils.printf(waitchars[waitindex + 1]) + end io.flush() -- start and wait this task @@ -172,8 +178,10 @@ function process.asyncrun(task, waitchars) if not ok then -- remove wait charactor - utils.printf("\b") - io.flush() + if show_wait then + utils.printf("\b") + io.flush() + end -- failed return false, errors @@ -183,8 +191,10 @@ function process.asyncrun(task, waitchars) while coroutine.status(task) ~= "dead" do -- trace - waitindex = ((waitindex + 1) % #waitchars) - utils.printf("\b" .. waitchars[waitindex + 1]) + if show_wait then + waitindex = ((waitindex + 1) % #waitchars) + utils.printf("\b" .. waitchars[waitindex + 1]) + end io.flush() -- wait some time @@ -195,8 +205,10 @@ function process.asyncrun(task, waitchars) if not ok then -- remove wait charactor - utils.printf("\b") - io.flush() + if show_wait then + utils.printf("\b") + io.flush() + end -- failed return false, errors @@ -204,8 +216,10 @@ function process.asyncrun(task, waitchars) end -- remove wait charactor - utils.printf("\b") - io.flush() + if show_wait then + utils.printf("\b") + io.flush() + end -- ok return true |