bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-01 16:13:27 +00:00
Code Issues Releases Wiki Activity

Simplify logic for resolving path to exe for native messaging (#814)

Browse Source
This commit is contained in:
Oscar Hinton
2021-03-25 23:11:31 +01:00
committed by GitHub
parent fa8b368b99
commit b5492e9546
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/nativeMessaging.main.ts
View File

@@ -12,7 +12,7 @@ export class NativeMessagingMain {
private connected = false;
private socket: any;
constructor(private logService: LogService, private windowMain: WindowMain, private userPath: string, private appPath: string) {}
constructor(private logService: LogService, private windowMain: WindowMain, private userPath: string, private exePath: string) {}
async listen() {
ipc.config.id = 'bitwarden';
@@ -182,14 +182,11 @@ export class NativeMessagingMain {
}
private binaryPath() {
const dir = path.join(this.appPath, '..');
if (process.platform === 'win32') {
return path.join(dir, 'native-messaging.bat');
} else if (process.platform === 'darwin') {
return '/Applications/Bitwarden.app/Contents/MacOS/Bitwarden';
return path.join(path.basename(this.exePath), 'resources', 'native-messaging.bat');
}
return path.join(dir, '..', 'bitwarden');
return this.exePath;
}
private async createWindowsRegistry(check: string, location: string, jsonFile: string) {