Install: log possible error when removing vendor dir

lovell · Apr 19, 2023 · d08baa2 · d08baa2
1 parent 391018a
commit d08baa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/install/libvips.js b/install/libvips.js
@@ -77,7 +77,11 @@ const verifyIntegrity = function (platformAndArch) {
     flush: function (done) {
       const digest = `sha512-${hash.digest('base64')}`;
       if (expected !== digest) {
-        libvips.removeVendoredLibvips();
+        try {
+          libvips.removeVendoredLibvips();
+        } catch (err) {
+          libvips.log(err.message);
+        }
         libvips.log(`Integrity expected: ${expected}`);
         libvips.log(`Integrity received: ${digest}`);
         done(new Error(`Integrity check failed for ${platformAndArch}`));

diff --git a/lib/libvips.js b/lib/libvips.js
@@ -88,8 +88,7 @@ const hasVendoredLibvips = function () {
 
 /* istanbul ignore next */
 const removeVendoredLibvips = function () {
-  const rm = fs.rmSync ? fs.rmSync : fs.rmdirSync;
-  rm(vendorPath, { recursive: true, maxRetries: 3, force: true });
+  fs.rmSync(vendorPath, { recursive: true, maxRetries: 3, force: true });
 };
 
 /* istanbul ignore next */