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

Use ES6 interpolation for string operations

Browse Source
This commit is contained in:
Cameron Diver 2018-06-06 14:10:11 +01:00
parent 51b5cff7b0
commit fa1d3da438
No known key found for this signature in database
GPG Key ID: 69264F9C923F55C1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/config-backend.ts
View File

@ -21,7 +21,7 @@ interface ExtlinuxFile {
globals: { [directive: string]: string }; globals: { [directive: string]: string };
} }
const bootMountPoint = constants.rootMountPoint + constants.bootMountPoint; const bootMountPoint = `${constants.rootMountPoint}${constants.bootMountPoint}`;
function remountAndWriteAtomic(file: string, data: string): Promise<void> { function remountAndWriteAtomic(file: string, data: string): Promise<void> {
// TODO: Find out why the below Promise.resolve() is required // TODO: Find out why the below Promise.resolve() is required
@ -145,7 +145,6 @@ export class RPiConfigBackend extends DeviceConfigBackend {
let confStatements: string[] = []; let confStatements: string[] = [];
_.each(opts, (value, key) => { _.each(opts, (value, key) => {
if (key === 'initramfs') { if (key === 'initramfs') {
confStatements.push(`${key} ${value}`); confStatements.push(`${key} ${value}`);
} else if(_.isArray(value)) { } else if(_.isArray(value)) {
@ -155,7 +154,7 @@ export class RPiConfigBackend extends DeviceConfigBackend {
} }
}); });
const confStr = confStatements.join('\n') + '\n'; const confStr = `${confStatements.join('\n')}\n`;
return remountAndWriteAtomic(RPiConfigBackend.bootConfigPath, confStr); return remountAndWriteAtomic(RPiConfigBackend.bootConfigPath, confStr);
} }
@ -301,7 +300,7 @@ export class ExtlinuxConfigBackend extends DeviceConfigBackend {
} }
public createConfigVarName(configName: string): string { public createConfigVarName(configName: string): string {
return ExtlinuxConfigBackend.bootConfigVarPrefix + configName; return `${ExtlinuxConfigBackend.bootConfigVarPrefix}${configName}`;
} }
private static parseExtlinuxFile(confStr: string): ExtlinuxFile { private static parseExtlinuxFile(confStr: string): ExtlinuxFile {
@ -332,7 +331,7 @@ export class ExtlinuxConfigBackend extends DeviceConfigBackend {
// Special handling for the MENU directive // Special handling for the MENU directive
if (directive === 'MENU') { if (directive === 'MENU') {
const parts = value.split(' '); const parts = value.split(' ');
directive = 'MENU ' + parts[0]; directive = `MENU ${parts[0]}`;
value = parts.slice(1).join(' '); value = parts.slice(1).join(' ');
} }