bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

use execPath if in pkg

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-22 19:15:35 -04:00
parent 870731a76c
commit 14e5291cae
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands/update.command.ts
View File

@@ -1,6 +1,7 @@
import * as AdmZip from 'adm-zip'; import * as AdmZip from 'adm-zip';
import * as program from 'commander'; import * as program from 'commander';
import * as fetch from 'node-fetch'; import * as fetch from 'node-fetch';
import * as path from 'path';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
@@ -8,7 +9,11 @@ import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse'; import { MessageResponse } from '../models/response/messageResponse';
export class UpdateCommand { export class UpdateCommand {
constructor(private platformUtilsService: PlatformUtilsService) { } inPkg: boolean = false;
constructor(private platformUtilsService: PlatformUtilsService) {
this.inPkg = !!(process as any).pkg;
}
async run(cmd: program.Command): Promise<Response> { async run(cmd: program.Command): Promise<Response> {
const currentVersion = this.platformUtilsService.getApplicationVersion(); const currentVersion = this.platformUtilsService.getApplicationVersion();
@@ -56,7 +61,8 @@ export class UpdateCommand {
try { try {
const zipBuffer = await zipResponse.buffer(); const zipBuffer = await zipResponse.buffer();
const zip = new AdmZip(zipBuffer); const zip = new AdmZip(zipBuffer);
zip.extractAllTo(__dirname, true); const currentDir = this.inPkg ? path.dirname(process.execPath) : __dirname;
zip.extractAllTo(currentDir, true);
res.title = 'Updated self to ' + tagName + '.'; res.title = 'Updated self to ' + tagName + '.';
if (responseJson.body != null && responseJson.body !== '') { if (responseJson.body != null && responseJson.body !== '') {
res.message = responseJson.body; res.message = responseJson.body;