Skip to content

fix: replace linux-distro with direct /etc/os-release parsing (#2236) #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caddydove wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: replace linux-distro with direct /etc/os-release parsing (#2236) #2308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions electron/ts/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,52 @@ class Api {
return await checkDiskSpace(app.getPath('userData'));
};

async linuxDistro (win: AppWindow): Promise<{ name: string; version: string }> {
const load = require('linux-distro');
return await load().catch((err: Error) => {
Util.log('error', `[Api].linuxDistro: ${err.message}`);
return { name: 'Unknown', version: 'Unknown' };
});
async linuxDistro (win: AppWindow): Promise<{ os: string; name: string; release: string; code: string }> {
try {
// Read /etc/os-release (standard on modern Linux) or /etc/lsb-release (older)
const paths = [ '/etc/os-release', '/usr/lib/os-release', '/etc/lsb-release' ];
let content = '';

for (const p of paths) {
try {
content = fs.readFileSync(p, 'utf-8');
break;
} catch (_) {};
};

if (!content) {
return { os: 'Linux', name: 'Unknown', release: '', code: '' };
};

const parse = (text: string): Map<string, string> => {
const map = new Map<string, string>();
for (const line of text.split('\n')) {
const trimmed = line.trim();
if (!trimmed || trimmed.startsWith('#')) continue;
const eq = trimmed.indexOf('=');
if (eq < 0) continue;
const key = trimmed.slice(0, eq).trim();
let val = trimmed.slice(eq + 1).trim();
if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
val = val.slice(1, -1);
};
map.set(key.toLowerCase(), val);
};
return map;
};

const vars = parse(content);

return {
os: vars.get('id') || vars.get('distrib_id') || 'linux',
name: vars.get('pretty_name') || vars.get('name') || vars.get('distrib_description') || '',
release: vars.get('version_id') || vars.get('distrib_release') || '',
code: vars.get('version_codename') || vars.get('distrib_codename') || '',
};
} catch (e: any) {
Util.log('error', `[Api].linuxDistro: ${e.message}`);
return { os: 'Unknown', name: 'Unknown', release: '', code: '' };
}
};

menu (win: AppWindow): void {
Expand Down
Loading