diff options
| author |   Martin Väth <martin@mvath.de> | 2017-11-04 08:31:59 +0100 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2017-11-04 08:31:59 +0100 |
| commit | 20c01f3384e26264aa3694eeb62eacd442e9e2b2 (patch) | |
| tree | ff02c235763e016c28ab26fae2d87a110c1ea480 /eclass | |
| parent | www-plugins/noscript: Version bump (diff) | |
| download | mv-20c01f3384e26264aa3694eeb62eacd442e9e2b2.tar.gz mv-20c01f3384e26264aa3694eeb62eacd442e9e2b2.tar.bz2 mv-20c01f3384e26264aa3694eeb62eacd442e9e2b2.zip | |
Fix and use manifest.json parsing when possible
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mv_mozextension-r1.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
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} } |