mirror of
https://github.com/Eugeny/tabby.git
synced 2025-06-09 05:50:08 +00:00
Include pagent.exe in installer, Remove check for pageant (fixed Eugeny#350)
This commit is contained in:
parent
197824004e
commit
a7687a6fc2
2
.gitignore
vendored
2
.gitignore
vendored
@ -28,3 +28,5 @@ docs/api
|
|||||||
.electron-symbols
|
.electron-symbols
|
||||||
sentry.properties
|
sentry.properties
|
||||||
sentry-symbols.js
|
sentry-symbols.js
|
||||||
|
|
||||||
|
terminus-ssh/util/pagent.exe
|
||||||
|
@ -9,10 +9,12 @@
|
|||||||
"typings": "typings/index.d.ts",
|
"typings": "typings/index.d.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "webpack --progress --color",
|
"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": [
|
"files": [
|
||||||
"dist"
|
"dist",
|
||||||
|
"util/pagent.exe"
|
||||||
],
|
],
|
||||||
"author": "Eugene Pankov",
|
"author": "Eugene Pankov",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -16,10 +16,6 @@ import { PromptModalComponent } from '../components/promptModal.component'
|
|||||||
import { PasswordStorageService } from './passwordStorage.service'
|
import { PasswordStorageService } from './passwordStorage.service'
|
||||||
import { SSHTabComponent } from '../components/sshTab.component'
|
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' })
|
@Injectable({ providedIn: 'root' })
|
||||||
export class SSHService {
|
export class SSHService {
|
||||||
private logger: Logger
|
private logger: Logger
|
||||||
@ -185,14 +181,7 @@ export class SSHService {
|
|||||||
|
|
||||||
let agent: string|null = null
|
let agent: string|null = null
|
||||||
if (this.hostApp.platform === Platform.Windows) {
|
if (this.hostApp.platform === Platform.Windows) {
|
||||||
const pageantRunning = new Promise<boolean>(resolve => {
|
agent = 'pageant'
|
||||||
windowsProcessTreeNative.getProcessList(list => { // eslint-disable-line block-scoped-var
|
|
||||||
resolve(list.some(x => x.name === 'pageant.exe'))
|
|
||||||
}, 0)
|
|
||||||
})
|
|
||||||
if (await pageantRunning) {
|
|
||||||
agent = 'pageant'
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
agent = process.env.SSH_AUTH_SOCK as string
|
agent = process.env.SSH_AUTH_SOCK as string
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user