From f17e2ac2d0073cb79e049e664ba2b61f9fa32571 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sat, 15 Aug 2020 23:46:20 +0300 Subject: [PATCH] Makefile: Improve usage of curl, replace wget usage Instead of redirecting stdout to a file, use "-o" to specify the output file; also use curl instead of wget for downloading Twemoji, which avoids needing them both installed (one should be enough) and pipe the output from the download directly to tar for unpacking. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b42421d..286a0a4 100644 --- a/Makefile +++ b/Makefile @@ -39,9 +39,9 @@ microblogpub: .PHONY: css css: # Download pure.css if needed - if [[ ! -f static/pure.css ]]; then curl https://unpkg.com/purecss@1.0.1/build/pure-min.css > static/pure.css; fi + if [[ ! -f static/pure.css ]]; then curl -Lo static/pure.css https://unpkg.com/purecss@1.0.1/build/pure-min.css; fi # Download the emojis from twemoji if needded - if [[ ! -d static/twemoji ]]; then wget https://github.com/twitter/twemoji/archive/v12.1.2.tar.gz && tar xvzf v12.1.2.tar.gz && mv twemoji-12.1.2/assets/svg static/twemoji && rm -rf twemoji-12.1.2 && rm -f v12.1.2.tar.gz; fi + if [[ ! -d static/twemoji ]]; then curl -L https://github.com/twitter/twemoji/archive/v12.1.2.tar.gz | tar xzf - && mv twemoji-12.1.2/assets/svg static/twemoji && rm -rf twemoji-12.1.2; fi # Run the docker-compose project locally (will perform a update if the project is already running) .PHONY: run