diff --git a/.gitignore b/.gitignore index 0319ee50..4a74c238 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ docs/api .electron-symbols sentry.properties sentry-symbols.js + +terminus-ssh/util/pagent.exe diff --git a/terminus-ssh/package.json b/terminus-ssh/package.json index dc1e0d97..9ca98396 100644 --- a/terminus-ssh/package.json +++ b/terminus-ssh/package.json @@ -9,10 +9,12 @@ "typings": "typings/index.d.ts", "scripts": { "build": "webpack --progress --color", - "watch": "webpack --progress --color --watch" + "watch": "webpack --progress --color --watch", + "postinstall": "xcopy /i node_modules\\ssh2\\util\\pagent.exe util\\" }, "files": [ - "dist" + "dist", + "util/pagent.exe" ], "author": "Eugene Pankov", "license": "MIT", diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts index 1e7446f3..a02543a8 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/terminus-ssh/src/services/ssh.service.ts @@ -16,10 +16,6 @@ import { PromptModalComponent } from '../components/promptModal.component' import { PasswordStorageService } from './passwordStorage.service' import { SSHTabComponent } from '../components/sshTab.component' -try { - var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires, no-var -} catch { } - @Injectable({ providedIn: 'root' }) export class SSHService { private logger: Logger @@ -185,14 +181,7 @@ export class SSHService { let agent: string|null = null if (this.hostApp.platform === Platform.Windows) { - const pageantRunning = new Promise(resolve => { - windowsProcessTreeNative.getProcessList(list => { // eslint-disable-line block-scoped-var - resolve(list.some(x => x.name === 'pageant.exe')) - }, 0) - }) - if (await pageantRunning) { - agent = 'pageant' - } + agent = 'pageant' } else { agent = process.env.SSH_AUTH_SOCK as string }