From 2c0ccb2e3672ec6f2f738e19fba4de216e61d857 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:10:34 -0700
Subject: [PATCH] Remove failed updater on double failure

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 ts/updater/common.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ts/updater/common.ts b/ts/updater/common.ts
index 0d568163af..ee89a55e01 100644
--- a/ts/updater/common.ts
+++ b/ts/updater/common.ts
@@ -722,6 +722,17 @@ export abstract class Updater {
             'downloadUpdate: Failed to restore from backup folder, ignoring',
             Errors.toLogFormat(restoreError)
           );
+
+          // If not possible - at least clean up
+          try {
+            await deleteTempDir(this.logger, restoreDir);
+          } catch (cleanupError) {
+            this.logger.warn(
+              'downloadUpdate: Failed to remove backup folder after ' +
+                'failed restore, ignoring',
+              Errors.toLogFormat(cleanupError)
+            );
+          }
         }
 
         this.logger.warn(