Added err and sourced it in doall.sh and license-reporter

1 files changed, 12 insertions, 5 deletions

diff --git a/addons.mozilla.org-fsd/get-data/license-reporter b/addons.mozilla.org-fsd/get-data/license-reporter
index 9bf4263..3e01334 100755
--- a/addons.mozilla.org-fsd/get-data/license-reporter
+++ b/addons.mozilla.org-fsd/get-data/license-reporter
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 #    This file is part of license-reporter
 #    Copyright (C) 2017, 2018 David Hedlund
 #
@@ -16,6 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source err
 
 #if [ "$data" == "search" ]; then search_page_variable='.results[]'; fi
 
@@ -36,6 +36,7 @@ if [ "$2" == "--debug" ]; then debug=true; else debug=false; fi
 
 minimum_average_daily_users="10000";
 
+scriptsrc=$(readlink -f -- "${BASH_SOURCE[0]}")
 SCRIPTSRC=$(readlink -f "$0" || echo "$0")
 RUN_PATH=$(dirname "${SCRIPTSRC}" || echo .)
 filename=$(basename "$0");
@@ -678,15 +679,19 @@ s|http|\nhttp|g;
                 echo "{{Entry" > wiki/$id.wiki
 
 	        # Dash have to be removed in jq 1.3: https://github.com/stedolan/jq/issues/341
-	        echo "|Name=$name
+                # Avoid specific versions since it's not compatible with all IceCat versions:
+                # |Version download=https://addons.mozilla.org/firefox/downloads/latest/$id/addon-$version_id-latest.xpi
+                # |Version identifier=$version
+                # |Version date=$version_date
+
+
+                echo "|Name=$name
 |Short description=$short_description
 |Full description=$full_description
 |Homepage URL=$homepage_url
 |Extension of=$extension_of
 |VCS checkout command=$vcs_checkout_command
-|Version identifier=$version
-|Version date=$version_date
-|Version download=https://addons.mozilla.org/firefox/downloads/latest/$id/addon-$version_id-latest.xpi
+|Version download=https://addons.mozilla.org/en-US/firefox/addon/$slug/versions/
 |Last review by=$last_review_by
 |Last review date=$last_review_date
 |Submitted by=$submitted_by
@@ -700,6 +705,8 @@ s|http|\nhttp|g;
 	        echo "{{Project license
 |License=$license
 |License copyright=$license_copyright
+|License note=\"License: $original_license\" listed
+at https://addons.mozilla.org/en-US/firefox/addon/adblock-plus/
 }}" >> wiki/$id.wiki
 
 	        if [[ "$support_url" != "" ]];