OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix alpine check

Browse Source
This commit is contained in:
Asher 2019-10-21 14:09:04 -05:00
parent 2458cde498
commit 76f6ff4145
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build.ts
View File

@ -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;

2
src/node/update.ts
View File

@ -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";
}
}