fix: correct validation functions imports

jurassiscripts · May 22, 2020 · 454cb75 · 454cb75
1 parent d3cc40e
commit 454cb75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/export_scripts.ts b/src/export_scripts.ts
@@ -1,6 +1,6 @@
 import { ConfigData } from "./load_config.ts";
-import { validateConfigData } from "./check_config_data.ts";
-import { checkScript } from "./check_script.ts";
+import { validateConfigData } from "./validate_config_data.ts";
+import { validateScript } from "./validate_script.ts";
 import { isWindows, OneOrMore, makeFileExecutable } from "./util.ts";
 import { normalizeScript } from "./normalize_script.ts";
 import { CompoundCommandItem } from "./command.ts";
@@ -33,7 +33,7 @@ export async function exportScripts(
   }
   await Promise.all(
     scripts.map(async (script) => {
-      checkScript(script, config);
+      validateScript(script, config);
       const scriptDef = config.scripts[script];
       const { scripts, ...rootConfig } = config;
       const commands = normalizeScript(scriptDef, rootConfig);

diff --git a/src/resolve_shell.ts b/src/resolve_shell.ts
@@ -6,13 +6,13 @@ const OS_FALLBACK_SHELL = isWindows ? "cmd.exe" : "sh";
 
 export function resolveShell(): string {
   let shell = Deno.env.get(SHELL_ENV_NAME);
-  if (checkShellFile(shell)) return shell as string;
+  if (validateShellFile(shell)) return shell as string;
   shell = Deno.env.get(OS_SHELL_ENV_NAME);
-  if (checkShellFile(shell)) return shell as string;
+  if (validateShellFile(shell)) return shell as string;
   return OS_FALLBACK_SHELL;
 }
 
-function checkShellFile(shell: string | undefined) {
+function validateShellFile(shell: string | undefined) {
   try {
     return shell && Deno.statSync(shell).isFile; // TODO check executable
   } catch (e) {

diff --git a/src/run_script.ts b/src/run_script.ts
@@ -5,8 +5,8 @@ import { bold } from "../deps.ts";
 import { normalizeScript } from "./normalize_script.ts";
 import { resolveShell } from "./resolve_shell.ts";
 import { runCommands } from "./run_commands.ts";
-import { validateConfigData } from "./check_config_data.ts";
-import { checkScript } from "./check_script.ts";
+import { validateConfigData } from "./validate_config_data.ts";
+import { validateScript } from "./validate_script.ts";
 
 export async function runScript(
   configData: ConfigData | null,
@@ -19,7 +19,7 @@ export async function runScript(
     printScriptsInfo(config);
     Deno.exit();
   }
-  checkScript(script, config);
+  validateScript(script, config);
   const scriptDef = config.scripts[script];
   const { scripts, ...rootConfig } = config;
   const commands = normalizeScript(scriptDef, rootConfig);