removed debugging output. added removal of repeated jre/jre etc in so… · facboy/node-java@87958e7 · GitHub

facboy / node-java Public

forked from joeferner/node-java

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 87958e7

Browse filesBrowse the repository at this point in the historyBrowse files

matthiasg

committed

removed debugging output. added removal of repeated jre/jre etc in so path

1 parent a19605a commit 87958e7
Copy full SHA for 87958e7

1 file changed

+14-6Lines changed: 14 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• postInstall.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎postInstall.js‎

Copy file name to clipboardExpand all lines: postInstall.js

+14-6Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -30,6 +30,18 @@ require('find-java-home')(function(err, home){
30	30	});
31	31
32	32	function getCorrectSoForPlatform(soFiles){
	33	+ var so = getCorrectSoForPlatform(soFiles);
	34	+ return removeDuplicateJre(so);
	35	+ }
	36	+
	37	+ function removeDuplicateJre(filePath){
	38	+ while(filePath.indexOf('jre/jre')>0){
	39	+ filePath = filePath.replace('jre','');
	40	+ }
	41	+ return filePath;
	42	+ }
	43	+
	44	+ function _getCorrectSoForPlatform(soFiles){
33	45
34	46	var architectureFolderNames = {
35	47	'ia32': 'i386',
@@ -43,14 +55,10 @@ function getCorrectSoForPlatform(soFiles){
43	55
44	56	for (var i = 0; i < soFiles.length; i++) {
45	57	var so = soFiles[i];
46		-
47		- console.log('so',so,requiredFolderName);
48	58
49		- if(so.indexOf('server'))
50		- if(so.indexOf(requiredFolderName)) {
51		- console.log('match',so)
	59	+ if(so.indexOf('server')>0)
	60	+ if(so.indexOf(requiredFolderName)>0)
52	61	return so;
53		- }
54	62	}
55	63
56	64	return soFiles[0];

0 commit comments

Comments

0 (0)