From 76f6ff4145b5de781646d98a2871685c4102ee2e Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 21 Oct 2019 14:09:04 -0500 Subject: [PATCH] Fix alpine check --- scripts/build.ts | 6 +++--- src/node/update.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.ts b/scripts/build.ts index 0fdff6e0..9bec0f06 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -106,7 +106,7 @@ class Builder { // (like --version) it outputs the version to stderr and exits with 1. const result = await util.promisify(cp.exec)("ldd --version") .catch((error) => ({ stderr: error.message, stdout: "" })); - if (/^musl/.test(result.stderr) || /^musl/.test(result.stdout)) { + if (/musl/.test(result.stderr) || /musl/.test(result.stdout)) { this._target = "alpine"; } else { this._target = "linux"; @@ -130,8 +130,8 @@ class Builder { /** * Return true if it looks like we're inside VS Code. This is used to prevent - * accidentally building inside while developing or to prevent trying to run - * `yarn` in VS Code when we aren't in VS Code. + * accidentally building inside VS Code while developing which causes issues + * because the watcher will try compiling those built files. */ private isInVscode(pathToCheck: string): boolean { let inside = false; diff --git a/src/node/update.ts b/src/node/update.ts index dcd0422b..f98c0fc8 100644 --- a/src/node/update.ts +++ b/src/node/update.ts @@ -130,7 +130,7 @@ export class UpdateService extends AbstractUpdateService { stderr: error.message, stdout: "", })); - if (/^musl/.test(result.stderr) || /^musl/.test(result.stdout)) { + if (/musl/.test(result.stderr) || /musl/.test(result.stdout)) { target = "alpine"; } }