From 43ea2752ebd04e75ecf9c5f26d49bdbdced3a30a Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Mon, 31 Jul 2023 10:57:02 -0700 Subject: [PATCH] docs: prep for 2.3.4 --- CHANGELOG.md | 4 ++++ lib/util.ts | 25 +++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afbd6a3d..0d947658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 2.3.4 | 2022-07-31 + +- Fix "insiders" string not matching correctly + ### 2.3.3 | 2022-06-10 - Disable GPU sandbox by default, fixing failures in some CI's. diff --git a/lib/util.ts b/lib/util.ts index 4d3d8470..7b5706ef 100644 --- a/lib/util.ts +++ b/lib/util.ts @@ -28,8 +28,8 @@ switch (process.platform) { process.arch === 'arm64' ? 'win32-arm64-archive' : process.arch === 'ia32' - ? 'win32-archive' - : 'win32-x64-archive'; + ? 'win32-archive' + : 'win32-x64-archive'; break; default: systemDefaultPlatform = @@ -37,7 +37,7 @@ switch (process.platform) { } export function isInsiderVersionIdentifier(version: string): boolean { - return version === 'insiders' || version.endsWith('-insider'); // insider or 1.2.3-insider version string + return version === 'insiders' || version === 'insider' || version.endsWith('-insider'); // insider or 1.2.3-insider version string } export function isStableVersionIdentifier(version: string): boolean { @@ -242,19 +242,16 @@ export function killTree(processId: number, force: boolean) { // when killing a process in Windows its child processes are *not* killed but become root processes. // Therefore we use TASKKILL.EXE - cp = spawn(path.join(windir, 'System32', 'taskkill.exe'), [ - ...force ? ['/F'] : [], - '/T', - '/PID', - processId.toString(), - ], { stdio: 'inherit' }); + cp = spawn( + path.join(windir, 'System32', 'taskkill.exe'), + [...(force ? ['/F'] : []), '/T', '/PID', processId.toString()], + { stdio: 'inherit' } + ); } else { // on linux and OS X we kill all direct and indirect child processes as well - cp = spawn('sh', [ - path.resolve(__dirname, '../killTree.sh'), - processId.toString(), - force ? '9' : '15', - ], { stdio: 'inherit' }); + cp = spawn('sh', [path.resolve(__dirname, '../killTree.sh'), processId.toString(), force ? '9' : '15'], { + stdio: 'inherit', + }); } return new Promise((resolve, reject) => {