Merge pull request #21 from anki-code/patch-2

Avoid changing global config

README.rst

@@ -15,6 +15,11 @@ This works with python 3.7.0, xonsh 0.8.8 and direnv 2.17.0.
 change log
 ==========
 
+1.6.4
+-----
+* PR https://github.com/74th/xonsh-direnv/pull/21
+
+
 1.6.3
 -----
 

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="xonsh-direnv",
-    version="1.6.3",
+    version="1.6.4",
     license="MIT",
     url="https://github.com/74th/xonsh-direnv",
     description="direnv support for the xonsh shell",

xontrib/direnv.xsh

@@ -1,17 +1,15 @@
 import json
 
-# workaround for https://github.com/74th/xonsh-direnv/issues/2
-$UPDATE_OS_ENVIRON = True
-
 def __direnv():
     r = $(direnv export json)
     if r:
         lines = json.loads(r)
-        for k, v in lines.items():
-            if v is None:
-                del __xonsh__.env[k]
-            else:
-                __xonsh__.env[k] = v
+        with __xonsh__.env.swap(UPDATE_OS_ENVIRON=True):  # workaround for https://github.com/74th/xonsh-direnv/issues/2
+            for k, v in lines.items():
+                if v is None:
+                    del __xonsh__.env[k]
+                else:
+                    __xonsh__.env[k] = v
 
 @events.on_post_rc
 def __direnv_post_rc(**kwargs) -> None: