add more tips

4 files changed, 11 insertions, 4 deletions

diff --git a/xmake/modules/private/service/distcc_build/server_session.lua b/xmake/modules/private/service/distcc_build/server_session.lua
index 39fa0cd0f..b614069a6 100644
--- a/xmake/modules/private/service/distcc_build/server_session.lua
+++ b/xmake/modules/private/service/distcc_build/server_session.lua
@@ -189,7 +189,7 @@ end
 
 -- get work directory
 function server_session:workdir()
-    return path.join(self:server():workdir(), "sessons", self:id())
+    return path.join(self:server():workdir(), "sessions", self:id())
 end
 
 -- get build directory
diff --git a/xmake/modules/private/service/remote_build/client.lua b/xmake/modules/private/service/remote_build/client.lua
index fe964f054..2ff66c845 100644
--- a/xmake/modules/private/service/remote_build/client.lua
+++ b/xmake/modules/private/service/remote_build/client.lua
@@ -19,6 +19,7 @@
 --
 
 -- imports
+import("core.base.tty")
 import("core.base.bytes")
 import("core.base.base64")
 import("core.base.socket")
@@ -491,7 +492,13 @@ end
 
 -- read stdin data
 function remote_build_client:_read_stdin(stream, opt)
+    local term = tty.term()
+    if term == "msys2" or term == "cygwin" then
+        wprint("we cannot capture stdin on %s, please pass `-y` option to xmake command or use cmd/powershell terminal!", term)
+    end
     while not opt.stop do
+        -- FIXME, io.readable is invalid on msys2/cygwin, it always return false
+        -- @see https://github.com/xmake-io/xmake/issues/2504
         if io.readable() then
             local line = io.read("L") -- with crlf
             if line and #line > 0 then
@@ -511,7 +518,7 @@ function remote_build_client:_read_stdin(stream, opt)
         end
     end
     -- say bye
-    if stream:send_msg(message.new_end({token = self:token()})) then
+    if stream:send_msg(message.new_end(self:session_id(), {token = self:token()})) then
         stream:flush()
     end
 end
diff --git a/xmake/modules/private/service/remote_build/server_session.lua b/xmake/modules/private/service/remote_build/server_session.lua
index ac7366fcd..54a39392c 100644
--- a/xmake/modules/private/service/remote_build/server_session.lua
+++ b/xmake/modules/private/service/remote_build/server_session.lua
@@ -224,7 +224,7 @@ end
 
 -- get work directory
 function server_session:workdir()
-    return path.join(self:server():workdir(), "sessons", self:id())
+    return path.join(self:server():workdir(), "sessions", self:id())
 end
 
 -- is connected?
diff --git a/xmake/modules/private/service/remote_cache/server_session.lua b/xmake/modules/private/service/remote_cache/server_session.lua
index 6ab5d9a06..8e4692767 100644
--- a/xmake/modules/private/service/remote_cache/server_session.lua
+++ b/xmake/modules/private/service/remote_cache/server_session.lua
@@ -174,7 +174,7 @@ end
 
 -- get work directory
 function server_session:workdir()
-    return path.join(self:server():workdir(), "sessons", self:id())
+    return path.join(self:server():workdir(), "sessions", self:id())
 end
 
 -- is connected?