diff --git a/lib/index.js b/lib/index.js index 12f3b5e..fe1c710 100644 --- a/lib/index.js +++ b/lib/index.js @@ -430,9 +430,9 @@ function main() { const files = [ { name: core.getInput("name"), - contents: insertLf(core.getInput("key", { required: true }), { - append: true, - }), + contents: insertLf(core.getInput("key", { + required: true, + }), false, true), options: { mode: 0o400, flag: "ax", @@ -440,10 +440,9 @@ function main() { }, { name: "known_hosts", - contents: insertLf(core.getInput("known_hosts", { required: true }), { - prepend: true, - append: true, - }), + contents: insertLf(core.getInput("known_hosts", { + required: true, + }), true, true), options: { mode: 0o644, flag: "a", @@ -451,10 +450,7 @@ function main() { }, { name: "config", - contents: insertLf(core.getInput("config"), { - prepend: true, - append: true, - }), + contents: insertLf(core.getInput("config"), true, true), options: { mode: 0o644, flag: "a", @@ -510,20 +506,20 @@ function getHomeEnv() { /** * prepend/append LF to value if not empty * @param value the value to insert LF - * @param options options + * @param prepend true to prepend + * @param append true to append * @returns new value */ -function insertLf(value, options) { - const normalizedOptions = Object.assign({ prepend: false, append: false }, options); +function insertLf(value, prepend, append) { let affectedValue = value; if (value.length === 0) { // do nothing if empty return ""; } - if (normalizedOptions.prepend && !affectedValue.startsWith("\n")) { + if (prepend && !affectedValue.startsWith("\n")) { affectedValue = `\n${affectedValue}`; } - if (normalizedOptions.append && !affectedValue.endsWith("\n")) { + if (append && !affectedValue.endsWith("\n")) { affectedValue = `${affectedValue}\n`; } return affectedValue; diff --git a/src/main.ts b/src/main.ts index 97c78e8..d44005e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,13 +10,6 @@ interface FileInfo options: fs.WriteFileOptions; } -/** options for insertLf() */ -interface InsertLfOptions -{ - prepend?: boolean; - append?: boolean; -} - /** * main function */ @@ -27,9 +20,9 @@ function main(): void const files: FileInfo[] = [ { name: core.getInput("name"), - contents: insertLf(core.getInput("key", {required: true}), { - append: true, - }), + contents: insertLf(core.getInput("key", { + required: true, + }), false, true), options: { mode: 0o400, flag: "ax", @@ -37,10 +30,9 @@ function main(): void }, { name: "known_hosts", - contents: insertLf(core.getInput("known_hosts", {required: true}), { - prepend: true, - append: true, - }), + contents: insertLf(core.getInput("known_hosts", { + required: true, + }), true, true), options: { mode: 0o644, flag: "a", @@ -48,10 +40,7 @@ function main(): void }, { name: "config", - contents: insertLf(core.getInput("config"), { - prepend: true, - append: true, - }), + contents: insertLf(core.getInput("config"), true, true), options: { mode: 0o644, flag: "a", @@ -123,16 +112,12 @@ function getHomeEnv(): string /** * prepend/append LF to value if not empty * @param value the value to insert LF - * @param options options + * @param prepend true to prepend + * @param append true to append * @returns new value */ -function insertLf(value: string, options: InsertLfOptions): string +function insertLf(value: string, prepend: boolean, append: boolean): string { - const normalizedOptions: Required = { - prepend: false, - append: false, - ...options, - }; let affectedValue = value; if(value.length === 0) @@ -140,11 +125,11 @@ function insertLf(value: string, options: InsertLfOptions): string // do nothing if empty return ""; } - if(normalizedOptions.prepend && !affectedValue.startsWith("\n")) + if(prepend && !affectedValue.startsWith("\n")) { affectedValue = `\n${affectedValue}`; } - if(normalizedOptions.append && !affectedValue.endsWith("\n")) + if(append && !affectedValue.endsWith("\n")) { affectedValue = `${affectedValue}\n`; }