From b97d3e30fb2970e0c84fc4f50c9dd30ac42bb5b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 08:54:28 +0000 Subject: [PATCH 01/21] Bump webpack from 5.70.0 to 5.72.0 Bumps [webpack](https://github.com/webpack/webpack) from 5.70.0 to 5.72.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.70.0...v5.72.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 2b59bf85..b27ff70e 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "typescript": "^4.3.5", "utils-decorators": "^1.10.4", "val-loader": "4.0.0", - "webpack": "^5.70.0", + "webpack": "^5.72.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^4.9.2", "yaml-loader": "0.6.0", diff --git a/yarn.lock b/yarn.lock index 31168870..36fc3838 100644 --- a/yarn.lock +++ b/yarn.lock @@ -890,12 +890,7 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== - -acorn@^8.5.0: +acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== @@ -8736,10 +8731,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.70.0: - version "5.70.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" - integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== +webpack@^5.72.0: + version "5.72.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" + integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" From 2e83b450a9be12462acc1f876b1314c003aa6aa3 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 19 Apr 2022 11:28:32 +0200 Subject: [PATCH 02/21] Update updater.service.ts --- tabby-electron/src/services/updater.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tabby-electron/src/services/updater.service.ts b/tabby-electron/src/services/updater.service.ts index 9ff2ae8d..18207912 100644 --- a/tabby-electron/src/services/updater.service.ts +++ b/tabby-electron/src/services/updater.service.ts @@ -57,6 +57,7 @@ export class ElectronUpdaterService extends UpdaterService { try { this.autoUpdater.setFeedURL({ provider: 's3', + bucket: 'tabby-updates', path: `updates-latest-${process.arch}`, }) this.autoUpdater.checkForUpdates() From 9a08bf878227c1a8d15973f873a41d1a5f6f396e Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 19 Apr 2022 12:30:24 +0200 Subject: [PATCH 03/21] Update updater.service.ts --- tabby-electron/src/services/updater.service.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tabby-electron/src/services/updater.service.ts b/tabby-electron/src/services/updater.service.ts index 18207912..9315d332 100644 --- a/tabby-electron/src/services/updater.service.ts +++ b/tabby-electron/src/services/updater.service.ts @@ -54,11 +54,15 @@ export class ElectronUpdaterService extends UpdaterService { config.ready$.toPromise().then(() => { if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TABBY_DEV) { this.logger.debug('Checking for updates') + let arch = process.arch + if (process.platform === 'darwin' && process.arch === 'x64') { + arch = 'x86_64' + } try { this.autoUpdater.setFeedURL({ provider: 's3', bucket: 'tabby-updates', - path: `updates-latest-${process.arch}`, + path: `updates-latest-${arch}`, }) this.autoUpdater.checkForUpdates() } catch (e) { From 4a822947418acdbc010e909205e05657740e7079 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 19 Apr 2022 13:31:50 +0200 Subject: [PATCH 04/21] fixed ARM macOS builds - fixes #6201 --- scripts/build-native.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index ee704559..ba14f9e1 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,11 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch +if (process.platform === 'win32' || process.platform === 'linux') { + process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch +} else { + process.env.ARCH ??= process.arch +} let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 4fb158d2a10a76742dbe48c2997114010942e720 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 04:19:47 +0000 Subject: [PATCH 05/21] Bump xterm-addon-search in /tabby-terminal Bumps [xterm-addon-search](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.18 to 0.9.0-beta.21. - [Release notes](https://github.com/xtermjs/xterm.js/releases) - [Commits](https://github.com/xtermjs/xterm.js/commits) --- updated-dependencies: - dependency-name: xterm-addon-search dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tabby-terminal/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-terminal/yarn.lock b/tabby-terminal/yarn.lock index 54ce5b43..22e70dd2 100644 --- a/tabby-terminal/yarn.lock +++ b/tabby-terminal/yarn.lock @@ -171,9 +171,9 @@ xterm-addon-ligatures@^0.6.0-beta.14: font-ligatures "^1.4.1" xterm-addon-search@^0.9.0-beta.18: - version "0.9.0-beta.18" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.18.tgz#5317aed1dc747f468ccb7ecd151fb00d82a8a19d" - integrity sha512-SAeA3thc2WJNYXwjOEJFLpZ1ZVOs22RLmz9a6WcrzXkvCjLZRvbRGwX25Ms+Dd7dVDQNbKVUzUJohspP/vYr0Q== + version "0.9.0-beta.21" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.21.tgz#5348fe25676cdd89ce3be52ae62a316b6f266176" + integrity sha512-jh6kfRCpWRvZZkV9QghFYesSYHjybaLNEyYAD6uilZYfNHoGLa0zPgUkLOqoECL7K6rhBmSYOkKbc9MG4wNFMQ== xterm-addon-serialize@^0.7.0-beta.12: version "0.7.0-beta.12" From 93081162fed5b9460926b263a9acfc56a26ff171 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 04:19:56 +0000 Subject: [PATCH 06/21] Bump xterm-addon-webgl in /tabby-terminal Bumps [xterm-addon-webgl](https://github.com/xtermjs/xterm.js) from 0.12.0-beta.27 to 0.12.0-beta.28. - [Release notes](https://github.com/xtermjs/xterm.js/releases) - [Commits](https://github.com/xtermjs/xterm.js/commits) --- updated-dependencies: - dependency-name: xterm-addon-webgl dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tabby-terminal/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-terminal/yarn.lock b/tabby-terminal/yarn.lock index 54ce5b43..1b173561 100644 --- a/tabby-terminal/yarn.lock +++ b/tabby-terminal/yarn.lock @@ -186,9 +186,9 @@ xterm-addon-unicode11@^0.4.0-beta.3: integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== xterm-addon-webgl@^0.12.0-beta.27: - version "0.12.0-beta.27" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.27.tgz#afc5bc01d1ef3af9005fb9f6325a4db9c92aa8d9" - integrity sha512-P948trotU8FMHtaA7C2x97VpLq6QLSjO53kWNvONS0/XwEKQBIYCI7Jfri2wcLgfQg6Cn4OQGLoj2YBK3MMyww== + version "0.12.0-beta.28" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.28.tgz#252f88fd15816c23789659a0e2545682cf1eec9c" + integrity sha512-xpqZRYlyv+aNdDl46W2Hi2fxakNvdJDmWhOwGHPjOmex+kOYdBvVn4rRZmJ7xrKFuQVOfzb3SQCmpZ/njCpBJA== "xterm@npm:@tabby-gang/xterm@^4.19.0-beta.2": version "4.19.0-beta.2" From b6d0bd2d4382030b69ff1d842b26bed4ac8fe1aa Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 20 Apr 2022 09:37:43 +0200 Subject: [PATCH 07/21] fixed search - fixes #6197 --- tabby-terminal/src/components/baseTerminalTab.component.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabby-terminal/src/components/baseTerminalTab.component.pug b/tabby-terminal/src/components/baseTerminalTab.component.pug index a4fd1e19..f31b7e27 100644 --- a/tabby-terminal/src/components/baseTerminalTab.component.pug +++ b/tabby-terminal/src/components/baseTerminalTab.component.pug @@ -3,7 +3,7 @@ search-panel( *ngIf='showSearchPanel && hasFocus', @toolbarSlide, - [@.disabled]='!config.store.accessibility.animations' + [@.disabled]='!config.store.accessibility.animations', [frontend]='frontend', (close)='showSearchPanel = false; frontend?.cancelSearch()' ) From ca441b6f8356adff33071da693cc212655f2cb8c Mon Sep 17 00:00:00 2001 From: zhipeng Date: Wed, 20 Apr 2022 19:34:06 +0800 Subject: [PATCH 08/21] fix import lowcase host from ssh/config --- tabby-electron/src/sshImporters.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabby-electron/src/sshImporters.ts b/tabby-electron/src/sshImporters.ts index eca1c384..bdba4eb9 100644 --- a/tabby-electron/src/sshImporters.ts +++ b/tabby-electron/src/sshImporters.ts @@ -26,7 +26,7 @@ export class OpenSSHImporter extends SSHProfileImporter { if (line.trim().startsWith('#') || !line.trim()) { continue } - if (line.startsWith('Host ')) { + if (line.toLowerCase().startsWith('host ')) { if (currentProfile) { results.push(currentProfile) } From 531b658405d44baa6e69ec7fa55053785a4a8773 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:35 +0000 Subject: [PATCH 09/21] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30a79898..ec96de3a 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
artu-ole
πŸ’»
Timofey Gribanov
πŸ“– 🌍
Christian Bingman
πŸ’» +
zhipeng
πŸ’» From 5dc3eecb74a05d7f348a361e13d344491ae231c5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:36 +0000 Subject: [PATCH 10/21] docs: update README.zh-CN.md [skip ci] --- README.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.zh-CN.md b/README.zh-CN.md index 80882cc0..b83c1b62 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -245,6 +245,7 @@
artu-ole
πŸ’»
Timofey Gribanov
πŸ“– 🌍
Christian Bingman
πŸ’» +
zhipeng
πŸ’» From 6bb8deacb78f11645ae02c84a6c327f5eb87849b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:36 +0000 Subject: [PATCH 11/21] docs: update README.ru-RU.md [skip ci] --- README.ru-RU.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ru-RU.md b/README.ru-RU.md index 9812cb10..29bad95e 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -246,6 +246,7 @@ Pull-запросы ΠΈ ΠΏΠ»Π°Π³ΠΈΠ½Ρ‹ ΠΏΡ€ΠΈΠ²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‚ΡΡ!
artu-ole
πŸ’»
Timofey Gribanov
πŸ“– 🌍
Christian Bingman
πŸ’» +
zhipeng
πŸ’» From b68213e278bdddeafb328b9548372db5f4344f35 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:37 +0000 Subject: [PATCH 12/21] docs: update README.ko-KR.md [skip ci] --- README.ko-KR.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ko-KR.md b/README.ko-KR.md index d88cc1c6..06712ba5 100644 --- a/README.ko-KR.md +++ b/README.ko-KR.md @@ -240,6 +240,7 @@ Pull requests and plugins are welcome!
artu-ole
πŸ’»
Timofey Gribanov
πŸ“– 🌍
Christian Bingman
πŸ’» +
zhipeng
πŸ’» From 88c2a9996bb8163698d0c425f8a220253a1ef87d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:39 +0000 Subject: [PATCH 13/21] docs: update README.it-IT.md [skip ci] --- README.it-IT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.it-IT.md b/README.it-IT.md index db1516bb..adfc4f7e 100644 --- a/README.it-IT.md +++ b/README.it-IT.md @@ -246,6 +246,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
artu-ole
πŸ’»
Timofey Gribanov
πŸ“– 🌍
Christian Bingman
πŸ’» +
zhipeng
πŸ’» From 1c011b6fe397c67544b92d779ecc2ead8832d8bc Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:20:39 +0000 Subject: [PATCH 14/21] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index f6534ac9..21e7d2e4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -701,6 +701,15 @@ "contributions": [ "code" ] + }, + { + "login": "Ox0400", + "name": "zhipeng", + "avatar_url": "https://avatars.githubusercontent.com/u/5310853?v=4", + "profile": "http://zhangzhipeng2023.cn/", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, From 7b6ce3aeba937565c05e5e66630cc9b8e69d49bd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:27 +0000 Subject: [PATCH 15/21] docs: update README.md [skip ci] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ec96de3a..fae4774b 100644 --- a/README.md +++ b/README.md @@ -247,6 +247,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Christian Bingman
πŸ’»
zhipeng
πŸ’» + +
woodmeal
πŸ’» + From 4e3caa7409111128b24f2bf6b6091e4a7ae081da Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:28 +0000 Subject: [PATCH 16/21] docs: update README.zh-CN.md [skip ci] --- README.zh-CN.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.zh-CN.md b/README.zh-CN.md index b83c1b62..8e2d374e 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -247,6 +247,9 @@
Christian Bingman
πŸ’»
zhipeng
πŸ’» + +
woodmeal
πŸ’» + From e3d6b5f3d7f7629d5b5510947827fe4608437eb4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:29 +0000 Subject: [PATCH 17/21] docs: update README.ru-RU.md [skip ci] --- README.ru-RU.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.ru-RU.md b/README.ru-RU.md index 29bad95e..e06e821f 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -248,6 +248,9 @@ Pull-запросы ΠΈ ΠΏΠ»Π°Π³ΠΈΠ½Ρ‹ ΠΏΡ€ΠΈΠ²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‚ΡΡ!
Christian Bingman
πŸ’»
zhipeng
πŸ’» + +
woodmeal
πŸ’» + From 81fe06a9f6295f55c7fb790b00e9dace797a577d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:30 +0000 Subject: [PATCH 18/21] docs: update README.ko-KR.md [skip ci] --- README.ko-KR.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.ko-KR.md b/README.ko-KR.md index 06712ba5..9e8311bc 100644 --- a/README.ko-KR.md +++ b/README.ko-KR.md @@ -242,6 +242,9 @@ Pull requests and plugins are welcome!
Christian Bingman
πŸ’»
zhipeng
πŸ’» + +
woodmeal
πŸ’» + From fd809d7d8521cdd82cfc5ff053710bfc58362a8d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:31 +0000 Subject: [PATCH 19/21] docs: update README.it-IT.md [skip ci] --- README.it-IT.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.it-IT.md b/README.it-IT.md index adfc4f7e..c1bd04f2 100644 --- a/README.it-IT.md +++ b/README.it-IT.md @@ -248,6 +248,9 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
Christian Bingman
πŸ’»
zhipeng
πŸ’» + +
woodmeal
πŸ’» + From 36a63e771fcd85b3c41c9fb6841bccd11de5432f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 07:50:32 +0000 Subject: [PATCH 20/21] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 21e7d2e4..4d0e36d9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -710,6 +710,15 @@ "contributions": [ "code" ] + }, + { + "login": "woodmeal", + "name": "woodmeal", + "avatar_url": "https://avatars.githubusercontent.com/u/104011197?v=4", + "profile": "https://github.com/woodmeal", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, From 25f5cf04ea8d1d72295d09769da22ab1e1bc5d8d Mon Sep 17 00:00:00 2001 From: woodmeal <104011197+woodmeal@users.noreply.github.com> Date: Fri, 22 Apr 2022 09:50:35 +0200 Subject: [PATCH 21/21] Adding env handlement for ssh profile sessions (#6242) --- tabby-ssh/src/session/ssh.ts | 8 ++++++++ tabby-ssh/tsconfig.typings.json | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tabby-ssh/src/session/ssh.ts b/tabby-ssh/src/session/ssh.ts index f0da8f13..5174a0d1 100644 --- a/tabby-ssh/src/session/ssh.ts +++ b/tabby-ssh/src/session/ssh.ts @@ -306,6 +306,14 @@ export class SSHSession { this.authUsername = 'root' } } + if (this.authUsername?.startsWith('$')) { + try { + const result = process.env[this.authUsername.slice(1)] + this.authUsername = result ?? this.authUsername + } catch { + this.authUsername = 'root' + } + } ssh.connect({ host: this.profile.options.host.trim(), diff --git a/tabby-ssh/tsconfig.typings.json b/tabby-ssh/tsconfig.typings.json index 891a0f24..5446e796 100644 --- a/tabby-ssh/tsconfig.typings.json +++ b/tabby-ssh/tsconfig.typings.json @@ -10,6 +10,7 @@ "paths": { "tabby-*": ["../../tabby-*"], "*": ["../../app/node_modules/*"] - } + }, + "types": ["node"] } }