Remove update_url from manifest.json for ATN and copy version from in…

…stall.rdf to manifest.json
mailredirect · Jan 1, 2019 · 05940f6 · 05940f6
1 parent 792e9a4
commit 05940f6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/chrome/locale/es-MX/mailredirect.dtd b/chrome/locale/es-MX/mailredirect.dtd
@@ -6,4 +6,4 @@
 
 <!ENTITY forwardAsRedirect.label "Redirigir">
 <!ENTITY forwardAsRedirect.accesskey "R">
-<!ENTITY forwardAsRedirect.tooltip "Redirigir el mensaje seleccionado">
+<!ENTITY forwardAsRedirect.tooltip "Redirigir el mensaje seleccionado">
diff --git a/make-amo.sh b/make-amo.sh
@@ -82,6 +82,9 @@ grep \<em:update -A 2 install.rdf > make-grep.txt
 grep -v -f make-grep.txt ../../code/install.rdf > install.rdf
 rm make-grep.txt
 version=$(grep em:version install.rdf | sed -r "s/^[^>]*>//" | sed -r "s/<.*$//")
+grep -v update_url manifest.json > manifest.tmp
+cat manifest.tmp | sed -e "s/\(\"strict_min_version\".*\),/\1/" -e "s/\$version/${version}/" > manifest.json
+rm manifest.tmp
 rm mailredirect-${version}-sm+tb.xpi 2> /dev/null
 zip -r -D -9 mailredirect-${version}-sm+tb.xpi -@ < mailredirect.txt
 rm mailredirect.txt

diff --git a/make-babelzilla.sh b/make-babelzilla.sh
@@ -22,6 +22,9 @@ echo icon.png >> mailredirect.txt
 echo LICENSE >> mailredirect.txt
 echo README >> mailredirect.txt
 version=`grep em:version install.rdf | sed -r "s/^[^>]*>//" | sed -r "s/<.*$//"`
+cp -p manifest.json manifest.tmp
+cat manifest.tmp | sed -e "s/\$version/${version}/" > manifest.json
+rm manifest.tmp
 rm mailredirect-${version}-sm+tb.xpi 2> /dev/null
 zip -r -D -9 mailredirect-${version}-sm+tb.xpi -@ < mailredirect.txt
 rm mailredirect.txt

diff --git a/make-sourceforge.sh b/make-sourceforge.sh
@@ -79,6 +79,9 @@ echo icon.png >> mailredirect.txt
 echo LICENSE >> mailredirect.txt
 echo README >> mailredirect.txt
 version=$(grep em:version install.rdf | sed -r "s/^[^>]*>//" | sed -r "s/<.*$//")
+cp -p manifest.json manifest.tmp
+cat manifest.tmp | sed -e "s/\$version/${version}/" > manifest.json
+rm manifest.tmp
 rm mailredirect-${version}-sm+tb.xpi 2> /dev/null
 zip -r -D -9 mailredirect-${version}-sm+tb.xpi -@ < mailredirect.txt
 rm mailredirect.txt

diff --git a/manifest.json b/manifest.json
@@ -8,7 +8,7 @@
   },
   "manifest_version": 2,
   "name": "Mail Redirect",
-  "version": "0.10.0a1",
+  "version": "$version",
   "author": "Onno Ekker",
   "icons": {
     "32": "icon.png"