From 2a82ee5a1c7e986c371de89c429b29f0673529a2 Mon Sep 17 00:00:00 2001
From: Oj <oj@oojmed.com>
Date: Thu, 14 Apr 2022 23:32:02 +0100
Subject: [PATCH] [AsarUpdate] Source cleanup / simplify

---
 src/asarUpdate.js | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/asarUpdate.js b/src/asarUpdate.js
index c204571..cbda45b 100644
--- a/src/asarUpdate.js
+++ b/src/asarUpdate.js
@@ -21,43 +21,25 @@ module.exports = async () => { // (Try) update asar
   await new Promise((res) => {
     const file = fs.createWriteStream(downloadPath);
 
-    file.on('error', e => {
-      log('AsarUpdate', e);
-      file.close();
-
-      res();
-    });
-
     file.on('finish', () => {
       file.close();
       res();
     });
 
-    const req = request.get(asarUrl);
-
-    req.on('response', (res) => res.pipe(file));
+    request.get(asarUrl).on('response', r => r.pipe(file));
   });
 
   if (fs.readFileSync(downloadPath, 'utf8').startsWith('<Error>')) return log('AsarUpdate', 'Download error');
 
-  if (await new Promise((res) => {
-    try {
-      fs.copyFileSync(downloadPath, asarPath); // Overwrite actual app.asar
-      fs.unlinkSync(downloadPath); // Delete downloaded temp file
-      res();
-    } catch (err) {
-      log('AsarUpdate', err);
-      res(true);
-    }
-  })) return;
+  fs.copyFileSync(downloadPath, asarPath); // Overwrite actual app.asar
+  fs.unlinkSync(downloadPath); // Delete downloaded temp file
 
-  const newHash = getAsarHash();
 
-  if (oaConfig.updatePrompt === true && originalHash !== newHash) {
+  if (oaConfig.updatePrompt === true && originalHash !== getAsarHash()) {
     const { response } = await dialog.showMessageBox(null, {
       message: 'Updated OpenAsar',
       detail: `Restart required to use new version.`,
-      buttons: ['Restart Now', 'Later'],
+      buttons: ['Restart', 'Later'],
       defaultId: 0
     });