ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-24 04:55:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trim newlines from sysinfo files

Browse Source 
Change-type: patch
This commit is contained in:
Felipe Lalanne 2022-05-23 14:08:08 -04:00
parent b361b8eebe
commit 76553c6b4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/system-info.ts
View File

@ -80,8 +80,8 @@ export async function getSystemId(): Promise<string | undefined> {
fs.readFile('/proc/device-tree/product-sn'),
fs.readFile('/sys/devices/soc0/serial_number'),
]);
// Remove the null byte at the end
return buffer.toString('utf-8').replace(/\0/g, '');
// Remove the null/newline bytes at the end
return buffer.toString('utf-8').replace(/\0/g, '').trim();
} catch {
// Otherwise use dmidecode
const [baseBoardInfo] = (
@ -98,7 +98,7 @@ export async function getSystemModel(): Promise<string | undefined> {
fs.readFile('/proc/device-tree/product-name'),
]);
// Remove the null byte at the end
return buffer.toString('utf-8').replace(/\0/g, '');
return buffer.toString('utf-8').replace(/\0/g, '').trim();
} catch {
const [baseBoardInfo] = (
await dmidecode('baseboard').catch(() => [] as DmiDecodeInfo[])