From b767a42249bf866ac4a52255b097ad713080e27c Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Thu, 12 Dec 2019 15:32:24 -0500 Subject: [PATCH] Linting --- src/tar.ts | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/tar.ts b/src/tar.ts index 26039b8..6014920 100644 --- a/src/tar.ts +++ b/src/tar.ts @@ -1,7 +1,18 @@ import { exec } from "@actions/exec"; import * as io from "@actions/io"; -export async function extractTar(archivePath: string, targetDirectory: string) { +async function getTarPath(): Promise { + // Explicitly use BSD Tar on Windows + const IS_WINDOWS = process.platform === "win32"; + return IS_WINDOWS + ? `${process.env["windir"]}\\System32\\tar.exe` + : await io.which("tar", true); +} + +export async function extractTar( + archivePath: string, + targetDirectory: string +): Promise { // Create directory to extract tar into await io.mkdirP(targetDirectory); @@ -11,17 +22,12 @@ export async function extractTar(archivePath: string, targetDirectory: string) { await exec(`"${await getTarPath()}"`, args); } -export async function createTar(archivePath: string, sourceDirectory: string) { +export async function createTar( + archivePath: string, + sourceDirectory: string +): Promise { // http://man7.org/linux/man-pages/man1/tar.1.html // tar [-options] [files or directories which to add into archive] const args = ["-cz", "-f", archivePath, "-C", sourceDirectory, "."]; await exec(`"${await getTarPath()}"`, args); } - -async function getTarPath(): Promise { - // Explicitly use BSD Tar on Windows - const IS_WINDOWS = process.platform === "win32"; - return IS_WINDOWS - ? `${process.env["windir"]}\\System32\\tar.exe` - : await io.which("tar", true); -}