From 6e4a6360409c1bc24232babd51112d9ac86b7585 Mon Sep 17 00:00:00 2001 From: joshdentremont Date: Mon, 22 Jul 2024 19:12:27 -0300 Subject: [PATCH] replaced wget with cURL (#47) --- README.md | 2 +- README.template.md | 2 +- setup.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b34a4f2..cd70bfc 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ See the [customizations](#customizations) steps afterwards about removing unwant - [Docker 24.0+](https://docs.docker.com/get-docker/) **Referring to the Docker Engine version, not Docker Desktop**. - [Docker Compose](https://docs.docker.com/compose/install/linux/) **Already included in OSX with Docker** - [mkcert 1.4+](https://github.com/FiloSottile/mkcert) -- `wget` and `git` +- `cURL` and `git` ## Java and macOS mkcert seems to have problems when running on Java installed via Homebrew. diff --git a/README.template.md b/README.template.md index f6096e9..889d36e 100644 --- a/README.template.md +++ b/README.template.md @@ -46,7 +46,7 @@ This is the development and production infrastructure for INSTITUTION's SITE_NAM - [Docker 24.0+](https://docs.docker.com/get-docker/) - [Docker Compose](https://docs.docker.com/compose/install/linux/) **Already included in OSX with Docker** - [mkcert 1.4+](https://github.com/FiloSottile/mkcert) **Local Development only** -- `wget` and `git` +- `cURL` and `git` # Docker Compose diff --git a/setup.sh b/setup.sh index 3cb28ff..38d7e79 100755 --- a/setup.sh +++ b/setup.sh @@ -112,9 +112,8 @@ function initialize_from_starter_site { local ref echo "Initializing from starter site..." ref=$(choose_ref "${repo}") - wget \ - -c "${repo}/archive/${ref}.tar.gz" \ - -O - | tar --strip-components=1 -C drupal/rootfs/var/www/drupal -xz + curl -L "${repo}/archive/${ref}.tar.gz" \ + | tar --strip-components=1 -C drupal/rootfs/var/www/drupal -xz rm -fr drupal/rootfs/var/www/drupal/.github git checkout drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt git add .