Merge pull request alibaba#214 from aliyun/vangie/fix_env

change PYTHONUSERBASE if setting
pythons · May 13, 2019 · eb3b939 · eb3b939
2 parents 92bcffa + cd2bbbe
commit eb3b939
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/install/env.js b/lib/install/env.js
@@ -21,7 +21,9 @@ function addEnv(envVars) {
     envs['PATH'] = `${customPath}:${defaultPath}`;
   }
 
-  envs['PYTHONUSERBASE']='/code/.fun/python';
+  if (!envs['PYTHONUSERBASE']) {
+    envs['PYTHONUSERBASE']='/code/.fun/python';
+  }
 
   return envs;
 }

diff --git a/test/install/env.test.js b/test/install/env.test.js
@@ -28,4 +28,12 @@ describe('install_env', ()=>{
 
     expect(envs).to.have.property('PATH', '/usr/bin:/code/.fun/root/usr/local/bin:/code/.fun/root/usr/local/sbin:/code/.fun/root/usr/bin:/code/.fun/root/usr/sbin:/code/.fun/root/sbin:/code/.fun/root/bin:/code/.fun/python/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/sbin:/bin');
   });
+
+  it('with_PYTHONUSERBASE', () => {
+    const envs = addEnv({
+      'PYTHONUSERBASE': '/mnt/nas/fun/python'
+    });
+
+    expect(envs).to.have.property('PYTHONUSERBASE', '/mnt/nas/fun/python');
+  });
 });