Skip to content

Commit a5c745f

Browse files
coco-supercoco-super
authored
add_LD_LIBRARY_PATH_env (#908)
1 parent 51f6b3e commit a5c745f

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎src/lib/install/env.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ const sysLibs = [
3535
'/usr/lib/x86_64-linux-gnu',
3636
'/usr/lib64',
3737
'/lib',
38-
'/lib/x86_64-linux-gnu'
38+
'/lib/x86_64-linux-gnu',
39+
'/python/lib/python2.7/site-packages',
40+
'/python/lib/python3.6/site-packages'
3941
];
4042

4143

@@ -57,13 +59,13 @@ function generateLibPath(envs, prefix) {
5759

5860
if (envs['LD_LIBRARY_PATH']) {
5961
libPath = `${envs['LD_LIBRARY_PATH']}:${libPath}`;
60-
}
62+
}
6163
return duplicateRemoval(libPath);
6264
}
6365

6466
const sysPaths = [
65-
'/usr/local/bin',
66-
'/usr/local/sbin',
67+
'/usr/local/bin',
68+
'/usr/local/sbin',
6769
'/usr/bin',
6870
'/usr/sbin',
6971
'/sbin',

‎src/lib/package/package.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ async function generateOssBucket(bucketName) {
252252
console.log(yellow(`using oss-bucket: ${bucketName}`));
253253

254254
if (process.stdin.isTTY && !await promptForConfirmContinue('Auto generate OSS bucket for you?')) {
255-
return (await promptForInputContinue('Input OSS bucket name:')).input;
255+
bucketName = (await promptForInputContinue('Input OSS bucket name:')).input;
256256
}
257257

258258
await ossClient.putBucket(bucketName);

‎test/build/build-opts.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('test generateBuildContainerBuildOpts', () => {
4141
expect(opts).to.eql({
4242
'Env': [
4343
'envKey=envValue',
44-
'LD_LIBRARY_PATH=/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code:/code/lib:/usr/local/lib',
44+
'LD_LIBRARY_PATH=/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code/.fun/root/python/lib/python2.7/site-packages:/code/.fun/root/python/lib/python3.6/site-packages:/code:/code/lib:/usr/local/lib',
4545
'PATH=/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:/code/node_modules/.bin:/code/.fun/python/bin:/code/.fun/node_modules/.bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/sbin:/bin',
4646
'NODE_PATH=/code/node_modules:/usr/local/lib/node_modules',
4747
'PYTHONUSERBASE=/code/.fun/python'

‎test/docker-opts.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ describe('test resolveDockerRegistry', () => {
7575
});
7676
});
7777

78-
const LD_LIBRARY_PATH = 'LD_LIBRARY_PATH=/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code:/code/lib:/usr/local/lib';
78+
const LD_LIBRARY_PATH = 'LD_LIBRARY_PATH=/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code/.fun/root/python/lib/python2.7/site-packages:/code/.fun/root/python/lib/python3.6/site-packages:/code:/code/lib:/usr/local/lib';
7979
const PATH = 'PATH=/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:/code/node_modules/.bin:/code/.fun/python/bin:/code/.fun/node_modules/.bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/sbin:/bin';
8080

8181
describe('test generateLocalInvokeOpts', () => {

‎test/fc.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ describe('Incorrect environmental variables', () => {
164164
FC.prototype.updateFunction,
165165
'localdemo',
166166
'nodejs6',
167-
{});
167+
undefined);
168168
});
169169

170170
it('invoke function sync', async () => {
@@ -326,7 +326,7 @@ describe('test processNasAutoConfiguration', ()=> {
326326

327327
const functionProp = tplWithNasAuto.Resources.localdemo.python3.Properties;
328328
functionProp.EnvironmentVariables = {
329-
'LD_LIBRARY_PATH': '/mnt/auto/root/usr/local/lib:/mnt/auto/root/usr/lib:/mnt/auto/root/usr/lib/x86_64-linux-gnu:/mnt/auto/root/usr/lib64:/mnt/auto/root/lib:/mnt/auto/root/lib/x86_64-linux-gnu',
329+
'LD_LIBRARY_PATH': '/mnt/auto/root/usr/local/lib:/mnt/auto/root/usr/lib:/mnt/auto/root/usr/lib/x86_64-linux-gnu:/mnt/auto/root/usr/lib64:/mnt/auto/root/lib:/mnt/auto/root/lib/x86_64-linux-gnu:/mnt/auto/root/python/lib/python2.7/site-packages:/mnt/auto/root/python/lib/python3.6/site-packages',
330330
'PYTHONUSERBASE': '/mnt/auto/python'
331331
};
332332

@@ -359,7 +359,7 @@ describe('test processNasAutoConfiguration', ()=> {
359359
});
360360

361361
const envs = {
362-
'LD_LIBRARY_PATH': '/mnt/auto/root/usr/local/lib:/mnt/auto/root/usr/lib:/mnt/auto/root/usr/lib/x86_64-linux-gnu:/mnt/auto/root/usr/lib64:/mnt/auto/root/lib:/mnt/auto/root/lib/x86_64-linux-gnu',
362+
'LD_LIBRARY_PATH': '/mnt/auto/root/usr/local/lib:/mnt/auto/root/usr/lib:/mnt/auto/root/usr/lib/x86_64-linux-gnu:/mnt/auto/root/usr/lib64:/mnt/auto/root/lib:/mnt/auto/root/lib/x86_64-linux-gnu:/mnt/auto/root/python/lib/python2.7/site-packages:/mnt/auto/root/python/lib/python3.6/site-packages',
363363
'NODE_PATH': '/mnt/auto/node_modules:/usr/local/lib/node_modules'
364364
};
365365

‎test/install/env.test.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('install_env', ()=>{
1818

1919
expect(envs).to.have.property('PATH', '/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:/code/node_modules/.bin:/code/.fun/python/bin:/code/.fun/node_modules/.bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/sbin:/bin');
2020
expect(envs).to.have.property('PYTHONUSERBASE', '/code/.fun/python');
21-
expect(envs).to.have.property('LD_LIBRARY_PATH', '/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code:/code/lib:/usr/local/lib');
21+
expect(envs).to.have.property('LD_LIBRARY_PATH', '/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code/.fun/root/python/lib/python2.7/site-packages:/code/.fun/root/python/lib/python3.6/site-packages:/code:/code/lib:/usr/local/lib');
2222
expect(envs).to.have.property('NODE_PATH', '/code/node_modules:/usr/local/lib/node_modules');
2323
});
2424

@@ -27,7 +27,7 @@ describe('install_env', ()=>{
2727
'LD_LIBRARY_PATH': '/usr/lib'
2828
});
2929

30-
expect(envs).to.have.property('LD_LIBRARY_PATH', '/usr/lib:/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code:/code/lib:/usr/local/lib');
30+
expect(envs).to.have.property('LD_LIBRARY_PATH', '/usr/lib:/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code/.fun/root/python/lib/python2.7/site-packages:/code/.fun/root/python/lib/python3.6/site-packages:/code:/code/lib:/usr/local/lib');
3131
});
3232

3333
it('with_PATH', () => {
@@ -58,8 +58,7 @@ describe('install_env', ()=>{
5858
const envs = addEnv({
5959
'LD_LIBRARY_PATH': '/usr/lib:/usr/lib:/usr/lib'
6060
});
61-
62-
expect(envs).to.have.property('LD_LIBRARY_PATH', '/usr/lib:/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code:/code/lib:/usr/local/lib');
61+
expect(envs).to.have.property('LD_LIBRARY_PATH', '/usr/lib:/code/.fun/root/usr/local/lib:/code/.fun/root/usr/lib:/code/.fun/root/usr/lib/x86_64-linux-gnu:/code/.fun/root/usr/lib64:/code/.fun/root/lib:/code/.fun/root/lib/x86_64-linux-gnu:/code/.fun/root/python/lib/python2.7/site-packages:/code/.fun/root/python/lib/python3.6/site-packages:/code:/code/lib:/usr/local/lib');
6362
});
6463

6564
it('with NODE_PATH', () => {

0 commit comments

Comments
 (0)