runcmd in server

3 files changed, 5 insertions, 6 deletions

diff --git a/xmake/modules/private/service/message.lua b/xmake/modules/private/service/message.lua
index e8c387681..84c3f464f 100644
--- a/xmake/modules/private/service/message.lua
+++ b/xmake/modules/private/service/message.lua
@@ -135,7 +135,7 @@ end
 function new_sync(session_id, start)
     return _new({
         code = message.CODE_SYNC,
-        start = start or true,
+        start = start,
         session_id = session_id
     })
 end
diff --git a/xmake/modules/private/service/remote_build/client.lua b/xmake/modules/private/service/remote_build/client.lua
index 87db928c2..72553b9f5 100644
--- a/xmake/modules/private/service/remote_build/client.lua
+++ b/xmake/modules/private/service/remote_build/client.lua
@@ -157,7 +157,7 @@ function remote_build_client:sync()
     print("%s: sync files in %s:%d ..", self, addr, port)
     if sock then
         local stream = socket_stream(sock)
-        if stream:send_msg(message.new_sync(session_id)) and stream:flush() then
+        if stream:send_msg(message.new_sync(session_id, true)) and stream:flush() then
             local msg = stream:recv_msg()
             if msg and msg:success() then
                 vprint(msg:body())
diff --git a/xmake/modules/private/service/remote_build/session.lua b/xmake/modules/private/service/remote_build/session.lua
index 7826b0bc6..16d131151 100644
--- a/xmake/modules/private/service/remote_build/session.lua
+++ b/xmake/modules/private/service/remote_build/session.lua
@@ -58,10 +58,7 @@ function session:sync(respmsg)
         body.path = sourcedir
         body.branch = source_branch
     else
-        local branch = git.branch({repodir = sourcedir})
-        if not branch or branch ~= source_branch then
-            git.checkout(source_branch, {repodir = sourcedir})
-        end
+        git.checkout(source_branch, {repodir = sourcedir})
     end
     vprint("%s: %s sync files ok", self, body.start and "start" or "finish")
 end
@@ -79,6 +76,8 @@ function session:runcmd(respmsg)
     local program = body.program
     local argv = body.argv
     vprint("%s: run command(%s) ..", self, os.args(table.join(program, argv)))
+    print(self:sourcedir())
+    os.execv(program, argv, {curdir = self:sourcedir()})
     vprint("%s: run command ok", self)
 end