Merge pull request joeferner#536 from andyf0x/master

joeferner · web-flow · commit ce4f251c1515 · 2021-10-18T10:05:24.000Z
Improve visibility of install problems
diff --git a/findJavaHome.js b/findJavaHome.js
@@ -1,6 +1,6 @@
 require('find-java-home')(function(err, home){
-  if(err){
-    console.error("[node-java] "+err);
+  if (err || !home) {
+    if (!err) err = Error('Unable to determine Java home location');
     process.exit(1);
   }
   process.stdout.write(home);
diff --git a/find_java_libdir.sh b/find_java_libdir.sh
@@ -66,8 +66,8 @@ main () {
     fi
   fi
 
-  if [[ -z "${lib_dir}" ]]; then
-    error "Can't find lib dir for ${os} ${target_arch}, java home: ${java_home}"
+  if [[ ! -d "${lib_dir}" ]]; then
+    error "Can't find lib dir '${lib_dir}' for ${os} ${target_arch}, java home: ${java_home}"
   fi
   echo "${lib_dir}"
 }
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`require('find-java-home')(function(err, home){`
`2`		`- if(err){`
`3`		`- console.error("[node-java] "+err);`
	`2`	`+ if (err \|\| !home) {`
	`3`	`+ if (!err) err = Error('Unable to determine Java home location');`
`4`	`4`	`process.exit(1);`
`5`	`5`	`}`
`6`	`6`	`process.stdout.write(home);`