summaryrefslogtreecommitdiff
path: root/xmake/core/base/tty.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2023-03-03 22:55:12 +0800
committerruki <[email protected]>2023-03-03 22:55:12 +0800
commit6c43a097157fe7f9e10e576aa637159503ff426a (patch)
tree06dd6da40f16fb306880b9c00bacdcd778a34660 /xmake/core/base/tty.lua
parent06ab760da4fa6ac649f617065cbee5024b82b575 (diff)
improve os.shell
Diffstat (limited to 'xmake/core/base/tty.lua')
-rw-r--r--xmake/core/base/tty.lua9
1 files changed, 1 insertions, 8 deletions
diff --git a/xmake/core/base/tty.lua b/xmake/core/base/tty.lua
index 842d5474b..26da74ecf 100644
--- a/xmake/core/base/tty.lua
+++ b/xmake/core/base/tty.lua
@@ -166,9 +166,7 @@ function tty.shell()
end
end
else
- if not shell and os.getenv("FISH_VERSION") then
- shell = "fish"
- end
+ shell = os.getenv("XMAKE_SHELL")
if not shell then
shell = os.getenv("SHELL")
if shell then
@@ -180,11 +178,6 @@ function tty.shell()
end
end
end
- if not shell then
- if os.getenv("BASH_VERSION") then
- shell = "bash"
- end
- end
end
tty._SHELL = shell or "sh"
end