Merge #6985
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:
commit
e4f922a74d
@ -340,7 +340,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
|
||||
});
|
||||
|
||||
// Patching executable if that's NixOS.
|
||||
if (await fs.stat("/etc/nixos").then(_ => true).catch(_ => false)) {
|
||||
if (await isNixOs()) {
|
||||
await patchelf(dest);
|
||||
}
|
||||
|
||||
@ -348,6 +348,15 @@ async function getServer(config: Config, state: PersistentState): Promise<string
|
||||
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> {
|
||||
while (true) {
|
||||
try {
|
||||
|
Loading…
Reference in New Issue
Block a user