Merge branch 'dev' into installtest

8 files changed, 18 insertions, 18 deletions

diff --git a/README.md b/README.md
index 41c1f5379..655018837 100644
--- a/README.md
+++ b/README.md
@@ -253,6 +253,6 @@ Some projects using xmake:
 ## Contacts
 
 * Email：[[email protected]](mailto:[email protected])
-* Homepage：[TBOOX Open Source Project](http://www.tboox.org/cn)
-* Community：[TBOOX Open Source Community](http://www.tboox.org/forum)
+* Homepage：[tboox.org](http://www.tboox.org)
+* Community：[Google Group](https://groups.google.com/forum/#!forum/xmake)
 
diff --git a/README_zh.md b/README_zh.md
index 05f04f7f4..b825be519 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -250,8 +250,8 @@ target("test")
 ## 联系方式
 
 * 邮箱：[[email protected]](mailto:[email protected])
-* 主页：[TBOOX开源工程](http://www.tboox.org/cn)
-* 社区：[TBOOX开源社区](http://www.tboox.org/forum)
+* 主页：[tboox.org](http://www.tboox.org/cn)
+* 社区：[Google Group](https://groups.google.com/forum/#!forum/xmake)
 * QQ群：343118190
 * 微信公众号：tboox-os
 
diff --git a/docs/cn/index.html b/docs/cn/index.html
index da2e693a5..002490006 100644
--- a/docs/cn/index.html
+++ b/docs/cn/index.html
@@ -148,8 +148,8 @@
 
 <ul>
   <li>邮箱：<a href="mailto:[email protected]">[email protected]</a></li>
-  <li>主页：<a href="http://www.tboox.org/cn">TBOOX开源工程</a></li>
-  <li>社区：<a href="http://www.tboox.org/forum">TBOOX开源社区</a></li>
+  <li>主页：<a href="http://www.tboox.org/cn">tboox.org</a></li>
+  <li>社区：<a href="https://groups.google.com/forum/#!forum/xmake">Google Group</a></li>
   <li>聊天：<a href="https://gitter.im/tboox/tboox?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"><img src="https://badges.gitter.im/tboox/tboox.svg" alt="Join the chat at https://gitter.im/tboox/tboox" /></a></li>
   <li>QQ群：343118190</li>
   <li>微信公众号：tboox-os</li>
diff --git a/docs/landing.html b/docs/landing.html
index 2d3ecc8c5..f8d4320f3 100644
--- a/docs/landing.html
+++ b/docs/landing.html
@@ -148,8 +148,8 @@
 
 <ul>
   <li>Email：<a href="mailto:[email protected]">[email protected]</a></li>
-  <li>Homepage：<a href="http://www.tboox.org/cn">TBOOX Open Source Project</a></li>
-  <li>Community：<a href="http://www.tboox.org/forum">TBOOX Open Source Community</a></li>
+  <li>Homepage：<a href="http://www.tboox.org">tboox.org</a></li>
+  <li>Community：<a href="https://groups.google.com/forum/#!forum/xmake">Google Group</a></li>
   <li>ChatRoom：<a href="https://gitter.im/tboox/tboox?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"><img src="https://badges.gitter.im/tboox/tboox.svg" alt="Join the chat at https://gitter.im/tboox/tboox" /></a></li>
 </ul>
 
diff --git a/docs/landing/build b/docs/landing/build
index aa77cf96e..aa77cf96e 100644..100755
--- a/docs/landing/build
+++ b/docs/landing/build
diff --git a/docs/landing/index.cn.md b/docs/landing/index.cn.md
index 1a477202f..06a56e53e 100644
--- a/docs/landing/index.cn.md
+++ b/docs/landing/index.cn.md
@@ -93,8 +93,8 @@ $ xmake run -d console
 ## 联系方式
 
 * 邮箱：[[email protected]](mailto:[email protected])
-* 主页：[TBOOX开源工程](http://www.tboox.org/cn)
-* 社区：[TBOOX开源社区](http://www.tboox.org/forum)
+* 主页：[tboox.org](http://www.tboox.org/cn)
+* 社区：[Google Group](https://groups.google.com/forum/#!forum/xmake)
 * 聊天：[![Join the chat at https://gitter.im/tboox/tboox](https://badges.gitter.im/tboox/tboox.svg)](https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 * QQ群：343118190
 * 微信公众号：tboox-os
diff --git a/docs/landing/index.md b/docs/landing/index.md
index 65b6331a2..8f9ebc648 100644
--- a/docs/landing/index.md
+++ b/docs/landing/index.md
@@ -93,6 +93,6 @@ $ xmake run -d console
 ## Contacts
 
 * Email：[[email protected]](mailto:[email protected])
-* Homepage：[TBOOX Open Source Project](http://www.tboox.org/cn)
-* Community：[TBOOX Open Source Community](http://www.tboox.org/forum)
+* Homepage：[tboox.org](http://www.tboox.org)
+* Community：[Google Group](https://groups.google.com/forum/#!forum/xmake)
 * ChatRoom：[![Join the chat at https://gitter.im/tboox/tboox](https://badges.gitter.im/tboox/tboox.svg)](https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/xmake/modules/privilege/sudo.lua b/xmake/modules/privilege/sudo.lua
index 099939fc9..d2e2de2cf 100644
--- a/xmake/modules/privilege/sudo.lua
+++ b/xmake/modules/privilege/sudo.lua
@@ -37,9 +37,9 @@ function _sudo(runner, cmd, ...)
     local program = find_sudo()
     assert(program, "sudo not found!")
 
-    -- FIXME: deal with spaces in `os.getenv("PATH")`
+    -- 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, ...)
+    runner(program .. " env PATH=\"" .. os.getenv("PATH") .. "\" " .. cmd, ...)
 end
 
 -- sudo run shell with administrator permission and arguments list
@@ -91,7 +91,7 @@ end
 
 -- sudo run shell with arguments list
 function runv(shellname, argv)
-    return _sudo(os.run, shellname, argv)
+    return _sudov(os.run, shellname, argv)
 end
 
 -- sudo quietly run shell and echo verbose info if [-v|--verbose] option is enabled
@@ -101,7 +101,7 @@ end
 
 -- sudo quietly run shell with arguments list and echo verbose info if [-v|--verbose] option is enabled
 function vrunv(shellname, argv)
-    return _sudo(os.vrunv, shellname, argv)
+    return _sudov(os.vrunv, shellname, argv)
 end
 
 -- sudo run shell and return output and error data
@@ -111,7 +111,7 @@ end
 
 -- sudo run shell and return output and error data
 function iorunv(shellname, argv)
-    return _sudo(os.iorunv, shellname, argv)
+    return _sudov(os.iorunv, shellname, argv)
 end
 
 -- sudo execute shell 
@@ -121,7 +121,7 @@ end
 
 -- sudo execute shell with arguments list
 function execv(shellname, argv)
-    return _sudo(os.execv, shellname, argv)
+    return _sudov(os.execv, shellname, argv)
 end
 
 -- sudo run lua script