mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix getLinuxName usage of fs-extra in shared

Browse source
This commit is contained in:
ayumi-signal 2023-09-06 11:38:54 -07:00 • committed by GitHub
parent 52fa2ddb03
commit b5f77a23dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ts/util/os/osMain.ts
View file

@ -2,8 +2,26 @@
// SPDX-License-Identifier: AGPL-3.0-only
import os from 'os';
import { readFileSync } from 'fs-extra';
import { getOSFunctions } from './shared';
const OS = getOSFunctions(os.release());
function getLinuxName(): string | undefined {
if (os.platform() !== 'linux') {
return undefined;
}
const etcOsRelease = readFileSync('/etc/os-release', 'utf-8');
const match = etcOsRelease.match(/^PRETTY_NAME=(.+?)$/m);
if (!match) {
return undefined;
}
return match[1];
}
const OS = {
...getOSFunctions(os.release()),
getLinuxName,
};
export default OS;

17
ts/util/os/shared.ts
View file

@ -2,7 +2,6 @@
// SPDX-License-Identifier: AGPL-3.0-only
import semver from 'semver';
import { readFileSync } from 'fs-extra';
function createIsPlatform(
platform: typeof process.platform,
@ -27,7 +26,6 @@ export type OSType = {
isLinux: (minVersion?: string) => boolean;
isMacOS: (minVersion?: string) => boolean;
isWindows: (minVersion?: string) => boolean;
getLinuxName: () => string | undefined;
};
export function getOSFunctions(osRelease: string): OSType {
@ -59,20 +57,6 @@ export function getOSFunctions(osRelease: string): OSType {
return 'os-linux';
};
const getLinuxName = (): string | undefined => {
if (!isLinux()) {
return undefined;
}
const etcOsRelease = readFileSync('/etc/os-release', 'utf-8');
const match = etcOsRelease.match(/^PRETTY_NAME=(.+?)$/m);
if (!match) {
return undefined;
}
return match[1];
};
return {
getClassName,
getName,
@ -80,6 +64,5 @@ export function getOSFunctions(osRelease: string): OSType {
isLinux,
isMacOS,
isWindows,
getLinuxName,
};
}