Merge pull request joeferner#536 from andyf0x/master

Improve visibility of install problems
jjuzna · Oct 18, 2021 · ce4f251 · ce4f251
2 parents 5b980ce + 88168d1
commit ce4f251
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
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