From e4ab1275672d2908f4f95969c6d33e090954af03 Mon Sep 17 00:00:00 2001
From: Sicco <hruskat@btlnet.com>
Date: Mon, 30 Jan 2023 15:05:53 +0100
Subject: [PATCH] Fix issues

---
 package.json               |  4 ++--
 tabby-local/src/session.ts |  2 +-
 yarn.lock                  | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index b086bbdc..d63f498f 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "cross-env": "7.0.3",
     "css-loader": "^6.7.1",
     "deep-equal": "2.0.5",
-    "electron": "21.3.0",
+    "electron": "21.3.1",
     "electron-builder": "^24.0.0-alpha.1",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
@@ -74,7 +74,7 @@
     "source-code-pro": "^2.38.0",
     "source-map-loader": "^3.0.1",
     "source-sans-pro": "3.6.0",
-    "ssh2": "Eugeny/ssh2#22735cecf1d9c118b2b8af1c2f80fe5b04996fe1",
+    "ssh2": "Eugeny/ssh2#9de907d62907d6d45debdcc0ed8dda5b7b19dc7c",
     "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.2",
     "thenby": "^1.3.4",
diff --git a/tabby-local/src/session.ts b/tabby-local/src/session.ts
index 84cbc5e8..5757f88c 100644
--- a/tabby-local/src/session.ts
+++ b/tabby-local/src/session.ts
@@ -100,7 +100,7 @@ function substituteEnv (env: Record<string, string>) {
     env = { ...env }
     const pattern = process.platform === 'win32' ? /%(\w+)%/g : /\$(\w+)\b/g
     for (const [key, value] of Object.entries(env)) {
-        env[key] = value.replace(pattern, function (substring, p1) {
+        env[key] = value.toString().replace(pattern, function (substring, p1) {
             if (process.platform === 'win32') {
                 return Object.entries(process.env).find(x => x[0].toLowerCase() === p1.toLowerCase())?.[1] ?? ''
             } else {
diff --git a/yarn.lock b/yarn.lock
index d055e3a6..3fc2d48a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3129,10 +3129,10 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz#2c6ea409b45cdb5c3e0cb2c08cf6c0ba7e0f2c26"
   integrity sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg==
 
-electron@21.3.0:
-  version "21.3.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.0.tgz#e9905e240add950443dc115b4be13d36162f0a05"
-  integrity sha512-MGRpshN8fBcx4IRuBABIsGDv0tB/MclIFsyFHFFXsBCUc+vIXaE/E6vuWaniGIFSz5WyeuapfTH5IeRb+7yIfw==
+electron@21.3.1:
+  version "21.3.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.1.tgz#02a61053ace79ecdc592afc641ff663dec805b42"
+  integrity sha512-Ik/I9oFHA1h32JRtRm6GMgYdUctFpF/tPnHyATg4r3LXBTUT6habGh3GxSdmmTa5JgtA7uJUEm8EjjZItk7T3g==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"
@@ -8455,9 +8455,9 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-ssh2@Eugeny/ssh2#22735cecf1d9c118b2b8af1c2f80fe5b04996fe1:
+ssh2@Eugeny/ssh2#9de907d62907d6d45debdcc0ed8dda5b7b19dc7c:
   version "1.11.0"
-  resolved "https://codeload.github.com/Eugeny/ssh2/tar.gz/22735cecf1d9c118b2b8af1c2f80fe5b04996fe1"
+  resolved "https://codeload.github.com/Eugeny/ssh2/tar.gz/9de907d62907d6d45debdcc0ed8dda5b7b19dc7c"
   dependencies:
     asn1 "^0.2.4"
     bcrypt-pbkdf "^1.0.2"