rewrite install and uninstall

1 files changed, 11 insertions, 4 deletions

diff --git a/xmake/core/platform/environment.lua b/xmake/core/platform/environment.lua
index 8c8569674..3897d00e8 100644
--- a/xmake/core/platform/environment.lua
+++ b/xmake/core/platform/environment.lua
@@ -25,6 +25,7 @@ local environment = environment or {}
 
 -- load modules
 local platform  = require("platform/platform")
+local sandbox   = require("sandbox/sandbox")
 
 -- load the given environment from the given platform
 function environment.load(plat)
@@ -43,14 +44,17 @@ end
 function environment.enter(name)
 
     -- load the environment module
-    local module, errors = environment.load(plat)
+    local module, errors = environment.load()
     if not module and errors then
         return false, errors
     end
 
     -- enter it
     if module then
-        module.enter(name)
+        local ok, errors = sandbox.load(module.enter, name)
+        if not ok then
+            return false, errors
+        end
     end
 
     -- ok
@@ -61,14 +65,17 @@ end
 function environment.leave(name)
 
     -- load the environment module
-    local module, errors = environment.load(plat)
+    local module, errors = environment.load()
     if not module and errors then
         return false, errors
     end
 
     -- leave it
     if module then
-        module.leave(name)
+        local ok, errors = sandbox.load(module.leave, name)
+        if not ok then
+            return false, errors
+        end
     end
 
     -- ok