From 4daf7f6526057ac6a0faf14b61f99c21bf126abc Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 26 May 2021 15:17:10 +0300
Subject: [PATCH] Timeout shell env sync (#2874)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/main/shell-sync.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/shell-sync.ts b/src/main/shell-sync.ts
index df542d56ed..ff38ede3bb 100644
--- a/src/main/shell-sync.ts
+++ b/src/main/shell-sync.ts
@@ -38,7 +38,12 @@ export async function shellSync() {
   let envVars = {};
 
   try {
-    envVars = await shellEnv(shell);
+    envVars = await Promise.race([
+      shellEnv(shell),
+      new Promise((_resolve, reject) => setTimeout(() => {
+        reject(new Error("Resolving shell environment is taking very long. Please review your shell configuration."));
+      }, 5_000))
+    ]);
   } catch (error) {
     logger.error(`shellEnv: ${error}`);
   }