summaryrefslogtreecommitdiff
path: root/xmake/actions/require/impl/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-02-05 00:57:48 +0800
committerruki <[email protected]>2020-02-07 22:45:56 +0800
commitf48d5e6837c0039651385f409c8f3fc8188e086b (patch)
tree461baae6a5785197c1b3faf937986ef9ea9af6b0 /xmake/actions/require/impl/package.lua
parent71e29f82a04a6a799997eda741c318969c57354b (diff)
improve runjobs to support timer
Diffstat (limited to 'xmake/actions/require/impl/package.lua')
-rw-r--r--xmake/actions/require/impl/package.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua
index 822dd59ed..9b1df68a2 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/actions/require/impl/package.lua
@@ -633,7 +633,7 @@ function _install_packages(packages_install, packages_download)
packages_installing[index] = nil
packages_downloading[index] = nil
- end, #packages_install, (option.get("verbose") or option.get("diagnosis")) and 1 or 4, 300, function (indices, tips)
+ end, #packages_install, (option.get("verbose") or option.get("diagnosis")) and 1 or 4, 300, function (running_jobs_indices)
-- do not print progress info if be verbose
if option.get("verbose") or not show_wait then
@@ -646,7 +646,7 @@ function _install_packages(packages_install, packages_download)
-- make installing and downloading packages list
local installing = {}
local downloading = {}
- for _, index in ipairs(indices) do
+ for _, index in ipairs(running_jobs_indices) do
local package = packages_installing[index]
if package then
table.insert(installing, package:name())
@@ -666,7 +666,7 @@ function _install_packages(packages_install, packages_download)
if #installing > 0 then
cprintf("%sinstalling ${magenta}%s${clear}", #downloading > 0 and ", " or "", table.concat(installing, ", "))
end
- cprintf(" .. ${dim}%s${clear}%s", tips and (tips .. " ") or "", waitchars[waitindex + 1])
+ cprintf(" .. %s", waitchars[waitindex + 1])
io.flush()
end)
end