From 5a5f1e79df8d41fe38be55a4419b7f026aae4f44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Aug 2021 06:25:41 +0000
Subject: [PATCH 1/3] Bump path-parse from 1.0.6 to 1.0.7

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf80727..99e976a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "java",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1282,9 +1282,9 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-type": {

From 8f0952da9d2c334dac3d318f9761730e1f587795 Mon Sep 17 00:00:00 2001
From: Andy Fox <andyf0x@users.noreply.github.com>
Date: Sat, 16 Oct 2021 14:35:19 -0700
Subject: [PATCH 2/3] Fix error check for bad javalib directory

Previously it was only reporting errors if the returned directory was
an empty string, so invalid path constructs were being returned.

The returned error message is also improved, so any bad path constructs
are visible during a failed installation.
---
 find_java_libdir.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/find_java_libdir.sh b/find_java_libdir.sh
index e6cf30d..8482378 100755
--- 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}"
 }

From 88168d12446d91540a00ed78c18f144df2c9e234 Mon Sep 17 00:00:00 2001
From: Andy Fox <andyf0x@users.noreply.github.com>
Date: Sun, 17 Oct 2021 16:22:56 -0700
Subject: [PATCH 3/3] Exit with error if Java home can't be found

---
 findJavaHome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/findJavaHome.js b/findJavaHome.js
index 2421daf..a4b1c82 100644
--- 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);