mozextension.eclass: fix sed which determines extension id

Closes: https://bugs.gentoo.org/717348
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index 68f401ee866178d1b05bb6a25ea46716943c6ec4..ea4f1eb143e9809e2420cc048e43ca9e991d5eee 100644 (file)
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -72,11 +72,11 @@ xpi_install() {
        #cd ${x}
        # determine id for extension
        if [[ -f "${x}"/install.rdf ]]; then
-       emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \
-               || die "failed to determine extension id from install.rdf"
+               emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)"
+               [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
        elif [[ -f "${x}"/manifest.json ]]; then
-               emid="$( sed -n 's/.*"id": "\(.*\)",/\1/p' "${x}"/manifest.json )" \
-                       || die "failed to determine extension id from manifest.json"
+               emid="$( sed -n 's/.*"id": "\(.*\)".*/\1/p' "${x}"/manifest.json )"
+               [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
        else
                die "failed to determine extension id"
        fi
@@ -101,11 +101,11 @@ xpi_copy() {
        #cd ${x}
        # determine id for extension
        if [[ -f "${x}"/install.rdf ]]; then
-       emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \
-               || die "failed to determine extension id from install.rdf"
+               emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)"
+               [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
        elif [[ -f "${x}"/manifest.json ]]; then
-               emid="$( sed -n 's/.*"id": "\([^"]*\)",.*/\1/p' "${x}"/manifest.json )" \
-                       || die "failed to determine extension id from manifest.json"
+               emid="$(sed -n 's/.*"id": "\([^"]*\)".*/\1/p' "${x}"/manifest.json)"
+               [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
        else
                die "failed to determine extension id"
        fi