From 171fa9387306642bc652a9702c33f1c53c990dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Thu, 26 Dec 2019 15:38:56 +0100
Subject: [PATCH] Force pv output

Even if redirected to a file
Allow to see progress when ran in a cron or something
---
 fetch_resources.sh    | 2 +-
 resolve_subdomains.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fetch_resources.sh b/fetch_resources.sh
index 393d8e1..4355347 100755
--- a/fetch_resources.sh
+++ b/fetch_resources.sh
@@ -33,7 +33,7 @@ rm top-1m.csv top-1m.csv.zip
 if [ -f subdomains/cisco-umbrella_popularity.cache.list ]
 then
     cp subdomains/cisco-umbrella_popularity.cache.list temp/cisco-umbrella_popularity.old.list
-    pv temp/cisco-umbrella_popularity.old.list temp/cisco-umbrella_popularity.fresh.list | sort -u > subdomains/cisco-umbrella_popularity.cache.list
+    pv -f temp/cisco-umbrella_popularity.old.list temp/cisco-umbrella_popularity.fresh.list | sort -u > subdomains/cisco-umbrella_popularity.cache.list
     rm temp/cisco-umbrella_popularity.old.list temp/cisco-umbrella_popularity.fresh.list
 else
     mv temp/cisco-umbrella_popularity.fresh.list subdomains/cisco-umbrella_popularity.cache.list
diff --git a/resolve_subdomains.sh b/resolve_subdomains.sh
index 0465799..d5ddeb8 100755
--- a/resolve_subdomains.sh
+++ b/resolve_subdomains.sh
@@ -8,12 +8,12 @@ function log() {
 }
 
 log "Compiling nameservers…"
-pv nameservers/*.list | ./validate_list.py --ip4 | sort -u > temp/all_nameservers_ip4.list
+pv -f nameservers/*.list | ./validate_list.py --ip4 | sort -u > temp/all_nameservers_ip4.list
 
 log "Compiling subdomains…"
 # Sort by last character to utilize the DNS server caching mechanism
 # (not as efficient with massdns but it's almost free so why not)
-pv subdomains/*.list | ./validate_list.py --domain | rev | sort -u | rev > temp/all_subdomains.list
+pv -f subdomains/*.list | ./validate_list.py --domain | rev | sort -u | rev > temp/all_subdomains.list
 
 log "Resolving subdomain…"
 date +%s > "last_updates/massdns.txt"
@@ -21,4 +21,4 @@ date +%s > "last_updates/massdns.txt"
 
 log "Importing into database…"
 [ $SINGLE_PROCESS -eq 1 ] && EXTRA_ARGS="--single-process"
-pv temp/all_resolved.txt | ./feed_dns.py massdns --ip4-cache "$CACHE_SIZE" $EXTRA_ARGS
+pv -f temp/all_resolved.txt | ./feed_dns.py massdns --ip4-cache "$CACHE_SIZE" $EXTRA_ARGS