From 8638295afb7acce10348c9285e72e108e03ba04a Mon Sep 17 00:00:00 2001 From: curben <2809763-curben@users.noreply.gitlab.com> Date: Wed, 1 Apr 2020 11:27:02 +0100 Subject: [PATCH] fix: switch to curl - busybox's wget doesn't support redirect --- .gitlab-ci.yml | 4 ++-- README.md | 4 ++-- script.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 714d8ec7..6e685e67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ deploy_job: stage: deploy_stage before_script: - - 'which ssh-agent || (apk update && apk add openssh-client git grep sed)' + - 'which ssh-agent || (apk update && apk add curl openssh-client git grep sed)' script: - sh script.sh @@ -61,7 +61,7 @@ failed_job: stage: failed_stage before_script: - - 'which ssh-agent || (apk update && apk add openssh-client git grep sed)' + - 'which ssh-agent || (apk update && apk add curl openssh-client git grep sed)' - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - echo "$GH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null diff --git a/README.md b/README.md index ce6fa2f8..d509cc18 100644 --- a/README.md +++ b/README.md @@ -114,14 +114,14 @@ Dnsmasq-compatible blocklist is also available. ``` mkdir -p ~/.config/urlhaus-filter/ -wget https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf -O ~/.config/urlhaus-filter/urlhaus-filter-dnsmasq.conf +curl https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf -o ~/.config/urlhaus-filter/urlhaus-filter-dnsmasq.conf printf "\nconf-file=$HOME/.config/urlhaus-filter/urlhaus-filter-dnsmasq.conf\n" >> /etc/dnsmasq.conf ``` ### Update ``` -wget https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf -O ~/.config/urlhaus-filter/urlhaus-filter-dnsmasq.conf +curl https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf -o ~/.config/urlhaus-filter/urlhaus-filter-dnsmasq.conf ```
diff --git a/script.sh b/script.sh index add6cdd5..5b36dc38 100644 --- a/script.sh +++ b/script.sh @@ -7,8 +7,8 @@ mkdir -p "tmp/" && cd "tmp/" ## Prepare datasets -wget "https://urlhaus.abuse.ch/downloads/csv/" -O "urlhaus.zip" -wget "https://tranco-list.eu/top-1m.csv.zip" -O "top-1m.csv.zip" +curl -L "https://urlhaus.abuse.ch/downloads/csv/" -o "urlhaus.zip" +curl -L "https://tranco-list.eu/top-1m.csv.zip" -o "top-1m.csv.zip" cp "../src/exclude.txt" "."