Updated FreeAMO: if ! ; then echo foo; fi # for pv

4 files changed, 9 insertions, 12 deletions

diff --git a/subprojects/freeamo/src/get-add-ons b/subprojects/freeamo/src/get-add-ons
index f7307d5..b2491ba 100644
--- a/subprojects/freeamo/src/get-add-ons
+++ b/subprojects/freeamo/src/get-add-ons
@@ -47,7 +47,7 @@ function get-add-ons--download {
         # Add-ons not avalible for GNU/Linux will be ignored (used to be very few though).
         wget -nc -q "https://addons.mozilla.org/firefox/downloads/latest/$slug/addon-$id-latest.xpi" || wget -nc -q "https://addons.mozilla.org/firefox/downloads/latest/$slug/platform:2/addon-$id-latest.xpi"
 
-        echo "foo" # Must be here to work with pv
+        if ! $debug; then echo "foo"; fi # for pv
         
     done < "$output_file" | pv__progress
 
@@ -85,7 +85,7 @@ function get-add-ons--filter {
         license_file_text=$(unzip -l "addon-$id-latest.xpi" | awk '{ print $4 }' | grep -E "^COPYING$|^COPYING.txt$|^COPYING.md$|^LICENSE$|^LICENSE.txt$|^LICENSE.md$" | sed ':a;N;$!ba;s/\n/\t/g' || echo "NOLICENSEFILEFOUND");
         echo -e "$file\\t$entry\\t$slug\\taddon-$id-latest.xpi\\t$license_file_text" >> "$run_path/build/index-search-pages--free-licenses--license-file-status.txt"
         
-        echo "foo" # Must be here to work with pv
+        if ! $debug; then echo "foo"; fi # for pv
 
     done < "$output_file" | pv__progress
 
diff --git a/subprojects/freeamo/src/get-licenses b/subprojects/freeamo/src/get-licenses
index be814f4..6f43518 100644
--- a/subprojects/freeamo/src/get-licenses
+++ b/subprojects/freeamo/src/get-licenses
@@ -63,8 +63,8 @@ function get-licenses--download {
 
         fi
 
+        if ! $debug; then echo "foo"; fi # for pv
 
-        echo "foo" # Must be here to work with pv
     done < "$output_file_1" | pv__progress
 
 }
@@ -87,7 +87,8 @@ function get-licenses--filter {
     rm -f "$run_path/build/index-search-pages--free-licenses.txt"
 
     echo "Filter free licenses for $pv__size entries."
-    
+
+    line=0
     while IFS= read -r table; do
 
         ((++line))
@@ -140,7 +141,7 @@ function get-licenses--filter {
             
         fi
 
-        echo "foo" # Must be here to work with pv
+        if ! $debug; then echo "foo"; fi # for pv
         
     done < "$output_file_1" | pv__progress
 
diff --git a/subprojects/freeamo/src/make-wiki b/subprojects/freeamo/src/make-wiki
index 657430d..3b7019b 100644
--- a/subprojects/freeamo/src/make-wiki
+++ b/subprojects/freeamo/src/make-wiki
@@ -214,9 +214,7 @@ at https://addons.mozilla.org/en-US/firefox/addon/adblock-plus/
     fi
 
     if ! $debug; then echo "foo"; fi # for pv
-done < "$output_file_2" # | pv__progress
-# End template
-
+done < "$output_file_2" | pv__progress
 
 if [ "$minimum_average_daily_users" == "100000" ]; then
 
diff --git a/subprojects/freeamo/src/search-pages b/subprojects/freeamo/src/search-pages
index 603c750..22f293a 100644
--- a/subprojects/freeamo/src/search-pages
+++ b/subprojects/freeamo/src/search-pages
@@ -88,7 +88,7 @@ function search-pages--download() {
 
         if [ ! "$pv__discard" = true ]; then
 
-            echo "foo" # Must be here to work with pv
+            if ! $debug; then echo "foo"; fi # for pv
 
         fi
 
@@ -130,10 +130,8 @@ function search-pages--filter() {
 
         done
 
-        echo "$filename"
+        if ! $debug; then echo "foo"; fi # for pv
 
-
-        echo "foo" # Must be here to work with pv
     done | pv__progress
 
 }