mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6985

Browse Source 
6985: Use /etc/os-release to check for NixOS r=matklad a=lnicola

Closes #5641

The motivation in #5641 isn't too strong, but /etc/os-release exists on pretty much every Linux distro, while /etc/nixos sounds like an implementation detail.


Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2020-12-21 18:21:49 +00:00 committed by GitHub
commit e4f922a74d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/code/src/main.ts
View File

@ -340,7 +340,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
}); });
// Patching executable if that's NixOS. // Patching executable if that's NixOS.
if (await fs.stat("/etc/nixos").then(_ => true).catch(_ => false)) { if (await isNixOs()) {
await patchelf(dest); await patchelf(dest);
} }
@ -348,6 +348,15 @@ async function getServer(config: Config, state: PersistentState): Promise<string
return dest; return dest;
} }
async function isNixOs(): Promise<boolean> {
try {
const contents = await fs.readFile("/etc/os-release");
return contents.indexOf("ID=nixos") !== -1;
} catch (e) {
return false;
}
}
async function downloadWithRetryDialog<T>(state: PersistentState, downloadFunc: () => Promise<T>): Promise<T> { async function downloadWithRetryDialog<T>(state: PersistentState, downloadFunc: () => Promise<T>): Promise<T> {
while (true) { while (true) {
try { try {