Merge branch 'dev' into installtest

1 files changed, 13 insertions, 3 deletions

diff --git a/xmake/modules/privilege/sudo.lua b/xmake/modules/privilege/sudo.lua
index d2e2de2cf..4eb5f6538 100644
--- a/xmake/modules/privilege/sudo.lua
+++ b/xmake/modules/privilege/sudo.lua
@@ -37,9 +37,19 @@ function _sudo(runner, cmd, ...)
     local program = find_sudo()
     assert(program, "sudo not found!")
 
-    -- FIXME: deal with quotes in `os.getenv("PATH")`
-    -- run it with administrator permission and preserve parent environment
-    runner(program .. " env PATH=\"" .. os.getenv("PATH") .. "\" " .. cmd, ...)
+    -- get current path environment
+    local pathenv = os.getenv("PATH") 
+    if pathenv and #pathenv > 0 then
+
+        -- handle double quote
+        pathenv = pathenv:gsub("\"", "\\\"")
+
+        -- run it with administrator permission and preserve parent environment
+        runner(program .. " env PATH=\"" .. pathenv .. "\" " .. cmd, ...)
+    else
+        -- run it with administrator permission
+        runner(program .. " " .. cmd, ...)
+    end
 end
 
 -- sudo run shell with administrator permission and arguments list