From 3b1e026beca15d11eb159132188c53f16a231f3e Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Tue, 12 Feb 2019 08:54:55 +0100 Subject: [PATCH 1/2] Adapt createZip.js to new esy. --- scripts/createZip.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/createZip.js b/scripts/createZip.js index d00b436..95390fb 100644 --- a/scripts/createZip.js +++ b/scripts/createZip.js @@ -13,6 +13,12 @@ const zipName = `${exeName}-${version}-${platform}.zip`; if (fs.existsSync(zipName)) { fs.unlinkSync(zipName); } -fs.copyFileSync("_build/default/bin/Extract.exe", exeName); + +const builtExePath = child_process + .execSync(`esy x which Extract.exe`) + .toString() + .trim(); + +fs.copyFileSync(builtExePath, exeName); child_process.execSync(`zip ${zipName} ${exeName}`); fs.unlinkSync(exeName); From d509a62a272d5565aa7c7ee86a01f718f51b6843 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Tue, 12 Feb 2019 09:17:46 +0100 Subject: [PATCH 2/2] Add zip to docker container. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9baaff0..3781649 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm git rsync m4 curl \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm git rsync m4 curl zip \ && rm -rf /var/lib/apt/lists/* RUN npm i -g esy@0.5.6