From 7c7d003bbbad33ad70cbf095976259f7c974d91b Mon Sep 17 00:00:00 2001 From: Aiqiao Yan Date: Fri, 10 Apr 2020 15:34:34 -0400 Subject: [PATCH] Rebase and rebuild --- dist/restore/index.js | 6 +----- dist/save/index.js | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index 8ccadfb..eeb2634 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -3036,12 +3036,8 @@ function createTar(archiveFolder, sourceDirectories) { const args = [ "-cz", "-f", -<<<<<<< HEAD - constants_1.CacheFilename, - "-P", -======= (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), ->>>>>>> Fallback to GNU tar if BSD tar is unavailable + "-P", "-C", (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), "--files-from", diff --git a/dist/save/index.js b/dist/save/index.js index 33d75c6..251e559 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -3017,12 +3017,8 @@ function createTar(archiveFolder, sourceDirectories) { const args = [ "-cz", "-f", -<<<<<<< HEAD - constants_1.CacheFilename, - "-P", -======= (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), ->>>>>>> Fallback to GNU tar if BSD tar is unavailable + "-P", "-C", (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), "--files-from",