summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-01-30 00:47:11 +0800
committerruki <[email protected]>2021-01-30 00:47:11 +0800
commit3b0db6a576d291e9aaadb5a485173c39fffb9c1e (patch)
tree17b22a02024d9f18a319a73d0ebf68c5a0bc3f21
parent7b4bc14f146ea74db69937d40675867f137e8266 (diff)
improve tty
-rw-r--r--xmake/core/base/tty.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmake/core/base/tty.lua b/xmake/core/base/tty.lua
index 0ad5ac449..f079de592 100644
--- a/xmake/core/base/tty.lua
+++ b/xmake/core/base/tty.lua
@@ -133,6 +133,7 @@ end
-- - msys2
-- - cygwin
-- - powershell
+-- - mintty
-- - windows-terminal
-- - gnome-terminal
-- - xfce4-terminal
@@ -152,6 +153,8 @@ function tty.term()
if TERM_PROGRAM ~= nil then
if TERM_PROGRAM:find("vscode", 1, true) then
term = "vscode"
+ elseif TERM_PROGRAM == "mintty" then
+ term = "mintty" -- git bash
end
end
end
@@ -203,7 +206,7 @@ function tty.has_emoji()
local winos = require("base/winos")
-- before win7 on cmd? disable it
- if has_emoji == nil and term == "cmd" and winos.version():le("win7") then
+ if has_emoji == nil and winos.version():le("win7") then
has_emoji = false
end