From 20c01f3384e26264aa3694eeb62eacd442e9e2b2 Mon Sep 17 00:00:00 2001
From: Martin Väth <martin@mvath.de>
Date: Sat, 4 Nov 2017 08:31:59 +0100
Subject: Fix and use manifest.json parsing when possible

---
 eclass/mv_mozextension-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'eclass/mv_mozextension-r1.eclass')

diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass
index 94fb5bb1..454cd1bc 100644
--- a/eclass/mv_mozextension-r1.eclass
+++ b/eclass/mv_mozextension-r1.eclass
@@ -357,10 +357,10 @@ moz_getid() {
 	else	file=${dir}/manifest.json
 		test -f "${file}" || die "cannot find ${dir}/{install.rdf,manifest.json}"
 		sub='^[[:space:]]*["'\''][iI][dD]["'\''][[:space:]]*:[[:space:]]*'
-		sub=${sub}'["'\'']\(.*\)["'\''][[:space:]]*,[[:space:]]*$/\1'
+		sub=${sub}'["'\'']\(.*\)["'\''][[:space:]]*,\?[[:space:]]*$/\1'
 		res=$(sed -n -e "s/${sub}/p" -- "${file}") || res=
 	fi
-	[ -n "${res}" ] || die "failed to determine id from ${file} $sub"
+	[ -n "${res}" ] || die "failed to determine id from ${file}"
 	eval ${var}=\${res}
 }
 
-- 
cgit v1.2.3-18-g5258