summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-21 00:35:14 +0800
committerruki <[email protected]>2017-09-20 21:31:27 +0800
commit7d95839ada4f468a2fd0c1cbe13febfb7dde146a (patch)
tree752d919a9171c3b2b990c258c62db504e7345a40
parent4d3fbc3c4027b391b5a2b9fe19b0598450162d05 (diff)
modify confirm tips
-rw-r--r--xmake/actions/config/main.lua2
-rw-r--r--xmake/actions/require/install.lua2
-rw-r--r--xmake/modules/package/manager/apt/install.lua2
-rw-r--r--xmake/modules/package/manager/pacman/install.lua2
-rw-r--r--xmake/modules/package/manager/yum/install.lua2
5 files changed, 5 insertions, 5 deletions
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 6b3e3222d..9170e75cf 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -152,7 +152,7 @@ function main()
if not option.get("quiet") and not option.get("yes") then
-- show tips
- cprint("${bright yellow}note: ${default yellow}xmake.lua not found, try generating it?")
+ cprint("${bright yellow}note: ${default yellow}xmake.lua not found, try generating it (pass -y to skip confirm)?")
cprint("please input: n (y/n)")
-- get answer
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua
index 96fcb44c3..865cd2c4d 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/actions/require/install.lua
@@ -106,7 +106,7 @@ function _get_confirm(packages)
if confirm == nil then
-- show tips
- cprint("${bright yellow}note: ${default yellow}try to install all required packages?")
+ cprint("${bright yellow}note: ${default yellow}try installing all required packages (pass -y to skip confirm)?")
for _, instance in ipairs(packages) do
if (option.get("force") or not instance:exists()) and (#instance:urls() > 0 or instance:script("install")) then
print(" -> %s %s", instance:fullname(), instance:version_str() or "")
diff --git a/xmake/modules/package/manager/apt/install.lua b/xmake/modules/package/manager/apt/install.lua
index 57bc88e94..0f3f2f0cb 100644
--- a/xmake/modules/package/manager/apt/install.lua
+++ b/xmake/modules/package/manager/apt/install.lua
@@ -59,7 +59,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${bright yellow}note: ${default yellow}try to install %s with administrator permission?", name)
+ cprint("${bright yellow}note: ${default yellow}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/modules/package/manager/pacman/install.lua b/xmake/modules/package/manager/pacman/install.lua
index 95116ba45..0813d339e 100644
--- a/xmake/modules/package/manager/pacman/install.lua
+++ b/xmake/modules/package/manager/pacman/install.lua
@@ -62,7 +62,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${bright yellow}note: ${default yellow}try to install %s with administrator permission?", name)
+ cprint("${bright yellow}note: ${default yellow}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/modules/package/manager/yum/install.lua b/xmake/modules/package/manager/yum/install.lua
index 581f557e0..0bdef8cc6 100644
--- a/xmake/modules/package/manager/yum/install.lua
+++ b/xmake/modules/package/manager/yum/install.lua
@@ -62,7 +62,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${bright yellow}note: ${default yellow}try to install %s with administrator permission?", name)
+ cprint("${bright yellow}note: ${default yellow}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer