From 8bb027279ae7b22b01f2a97f85659a9003cd28f4 Mon Sep 17 00:00:00 2001 From: Christopher Allford Date: Mon, 28 Feb 2022 09:39:19 -0800 Subject: [PATCH] Addressed PR Feedback --- tools/monorepo-merge/bin/dev.cmd | 2 +- tools/monorepo-merge/src/commands/merge/index.ts | 10 +++++----- tools/monorepo-merge/src/node-async.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/monorepo-merge/bin/dev.cmd b/tools/monorepo-merge/bin/dev.cmd index 077b57ae752..8ae2b12c192 100644 --- a/tools/monorepo-merge/bin/dev.cmd +++ b/tools/monorepo-merge/bin/dev.cmd @@ -1,3 +1,3 @@ @echo off -node "%~dp0\dev" %* \ No newline at end of file +node "%~dp0\dev" %* diff --git a/tools/monorepo-merge/src/commands/merge/index.ts b/tools/monorepo-merge/src/commands/merge/index.ts index 48816849777..a000f01e862 100644 --- a/tools/monorepo-merge/src/commands/merge/index.ts +++ b/tools/monorepo-merge/src/commands/merge/index.ts @@ -88,7 +88,7 @@ export default class Merge extends Command { } /** - * Validates all of the arguments to make sure + * Validates all of the arguments to make sure they're compatible with the command. * * @param {string} source The GitHub repository we are merging. * @param {string} destination The local path we're merging into. @@ -102,15 +102,15 @@ export default class Merge extends Command { } // We can't merge into a directory that already exists. - let existence = false; + let exists = false; try { await access( join( MONOREPO_ROOT, destination ) ); - existence = true; + exists = true; } catch (err: any) { - existence = false; + exists = false; } - if ( existence ) { + if ( exists ) { this.error('The "destination" argument points to a directory that already exists'); } } diff --git a/tools/monorepo-merge/src/node-async.ts b/tools/monorepo-merge/src/node-async.ts index db85f8becec..377c2acb286 100644 --- a/tools/monorepo-merge/src/node-async.ts +++ b/tools/monorepo-merge/src/node-async.ts @@ -42,4 +42,4 @@ export async function exec( command: string, options?: ExecOptions ): Promise< s resolve( stdout ); } ); } ); -} \ No newline at end of file +}