diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /eclass/mozextension.eclass | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'eclass/mozextension.eclass')
| -rw-r--r-- | eclass/mozextension.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index 68f401ee8661..ea4f1eb143e9 100644 --- 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 |