Fix name check workflows (#1098)

SleeplessByte · web-flow · commit 3c18c8e90d95 · 2021-04-16T05:00:43.000+02:00
diff --git a/scripts/name-check b/scripts/name-check
@@ -16,40 +16,39 @@ let { packageFiles, registerExitHandler } = require('./helpers');
 
 registerExitHandler();
 
-let exitCode = 0;
-
 // First 2 arguments are node and script name skip them
 // Check if rest has --fix
 const fix = process.argv.slice(2).includes('--fix');
 
 const envAssignment = shell.env['ASSIGNMENT'];
-if(envAssignment) {
+if (envAssignment) {
   packageFiles = [`exercises/${envAssignment}/package.json`];
 }
 
 // Check if package name in each exercises' package.json is of the format "@exercism/javascript-<exercise>"
-packageFiles.forEach(filePath => {
+packageFiles.forEach((filePath) => {
   const file = JSON.parse(shell.cat(filePath).toString());
 
   const givenName = file['name'];
   const exerciseName = filePath.split('/')[2];
   const expectedName = `@exercism/javascript-${exerciseName}`;
 
-  if(givenName == expectedName) {
+  if (givenName === expectedName) {
     shell.echo(`[Success]: Package name ${givenName} is in correct format`);
     return;
   }
 
-  if(fix) {
+  if (fix) {
     file['name'] = expectedName;
-    const fileWithFixedName = new shell.ShellString(JSON.stringify(file, undefined, 2) + '\n');
+    const fileWithFixedName = new shell.ShellString(
+      JSON.stringify(file, undefined, 2) + '\n'
+    );
     fileWithFixedName.to(filePath);
     shell.echo(`[Success]: Fixed package name in ${filePath}`);
-  }
-  else {
-    exitCode = 1;
-    shell.echo(`[Failure]: Package name in ${filePath} must be ${expectedName}"`);
+  } else {
+    shell.echo(
+      `[Failure]: Package name in ${filePath} must be ${expectedName}"`
+    );
+    shell.exit(1);
   }
 });
-
-shell.exit(exitCode);
diff --git a/scripts/name-uniq b/scripts/name-uniq
@@ -13,16 +13,19 @@ const { packageFiles, registerExitHandler } = require('./helpers');
 
 registerExitHandler();
 
-let exitCode = 0;
-const allNames = packageFiles.map(filePath => JSON.parse(shell.cat(filePath).toString())['name']);
+const allNames = packageFiles.map(
+  (filePath) => JSON.parse(shell.cat(filePath).toString())['name']
+);
 
 // Check if all exercises have unique package names
-const duplicates = allNames.filter((e, i) => allNames.indexOf(e) !== i)
-if(duplicates.length !== 0) {
-  exitCode = 1
-  shell.echo(`[Failure] Duplicate package names found: ${duplicates.join(', ')}`);
-}
+const duplicates = allNames.filter((e, i) => allNames.indexOf(e) !== i);
 
-if(exitCode == 0) {
-  shell.echo('[Success] All package names are unique.');
+if (duplicates.length !== 0) {
+  shell.echo(
+    `[Failure] Duplicate package names found: ${duplicates.join(', ')}`
+  );
+  shell.exit(1);
 }
+
+shell.echo('[Success] All package names are unique.');
+shell.exit(1);
