diff --git a/README.md b/README.md index 2c1c47f7..f8d109a6 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ For more information see [this issue](https://github.com/InseeFrLab/keycloakify/ **All this is defaults with [`create-react-app`](https://create-react-app.dev)** (tested with 4.0.3) -- `mvn` ([Maven](https://maven.apache.org/)), `rm`, `mkdir`, `wget`, `unzip` are assumed to be available. +- `mvn` ([Maven](https://maven.apache.org/)), `rm`, `mkdir`, `curl`, `unzip` are assumed to be available. - `docker` must be up and running when running `yarn keycloak`. On Windows you'll have to use [WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10). diff --git a/src/bin/tools/downloadAndUnzip.ts b/src/bin/tools/downloadAndUnzip.ts index 876539ca..ea1853a9 100644 --- a/src/bin/tools/downloadAndUnzip.ts +++ b/src/bin/tools/downloadAndUnzip.ts @@ -1,7 +1,7 @@ import { basename as pathBasename, join as pathJoin } from "path"; import { execSync } from "child_process"; import fs from "fs"; -import { transformCodebase } from "../tools/transformCodebase"; +import { transformCodebase } from "./transformCodebase"; import { rm_rf, rm, rm_r } from "./rm"; /** assert url ends with .zip */ @@ -9,14 +9,15 @@ export function downloadAndUnzip(params: { url: string; destDirPath: string; pat const { url, destDirPath, pathOfDirToExtractInArchive } = params; const tmpDirPath = pathJoin(destDirPath, "..", "tmp_xxKdOxnEdx"); + const zipFilePath = pathBasename(url); rm_rf(tmpDirPath); fs.mkdirSync(tmpDirPath, { "recursive": true }); - execSync(`wget ${url}`, { "cwd": tmpDirPath }); + execSync(`curl -L ${url} -o ${zipFilePath}`, { "cwd": tmpDirPath }); - execSync(`unzip ${pathBasename(url)}${pathOfDirToExtractInArchive === undefined ? "" : ` "${pathOfDirToExtractInArchive}/*"`}`, { + execSync(`unzip ${zipFilePath}${pathOfDirToExtractInArchive === undefined ? "" : ` "${pathOfDirToExtractInArchive}/*"`}`, { "cwd": tmpDirPath, });