From d6bb268315989935fe77798f4f3c388aedca1369 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Tue, 21 Aug 2018 15:02:42 -0500
Subject: [PATCH] nodeenv exports need to be in a sourced file to avoid nvm
 conflict

---
 Dockerfile                    | 1 +
 env/.bash_env                 | 6 +-----
 env/.bash_env_nodeenv_exports | 5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 env/.bash_env_nodeenv_exports

diff --git a/Dockerfile b/Dockerfile
index 1c55c04..1c0e5dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -192,6 +192,7 @@ COPY env/docker-entrypoint.sh \
      /usr/local/bin/
 COPY --chown=embark:embark \
      env/.bash_env \
+     env/.bash_env_nodeenv_exports \
      env/.bash_env_unset_npm_config \
      env/.bashrc \
      env/.npmrc \
diff --git a/env/.bash_env b/env/.bash_env
index 86eaf91..8a00d72 100644
--- a/env/.bash_env
+++ b/env/.bash_env
@@ -25,11 +25,7 @@ nac () {
         return 1
     fi
     export -f deactivate_node
-    export _OLD_NODE_PATH
-    export _OLD_NODE_VIRTUAL_PATH
-    export _OLD_NODE_VIRTUAL_PS1
-    export _OLD_npm_config_prefix
-    export _OLD_NPM_CONFIG_PREFIX
+    . "${HOME}/.bash_env_nodeenv_exports"
     alias denac='deactivate_node'
     alias deactivate_node='__denac'
     __versions
diff --git a/env/.bash_env_nodeenv_exports b/env/.bash_env_nodeenv_exports
new file mode 100644
index 0000000..9d75221
--- /dev/null
+++ b/env/.bash_env_nodeenv_exports
@@ -0,0 +1,5 @@
+export _OLD_NODE_PATH
+export _OLD_NODE_VIRTUAL_PATH
+export _OLD_NODE_VIRTUAL_PS1
+export _OLD_npm_config_prefix
+export _OLD_NPM_CONFIG_PREFIX