[gentoo-commits] gentoo-x86 commit in eclass: mozextension.eclass

[Jory Pratt (anarchy)]

anarchy     10/12/30 03:06:04

  Modified:             mozextension.eclass
  Log:
  cleanup parsing of install.rdf for extensions, bug #301920

Revision  Changes    Path
1.5                  eclass/mozextension.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?r1=1.4&r2=1.5

Index: mozextension.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mozextension.eclass	20 Dec 2007 15:43:14 -0000	1.4
+++ mozextension.eclass	30 Dec 2010 03:06:04 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.4 2007/12/20 15:43:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.5 2010/12/30 03:06:04 anarchy Exp $
 #
 # mozextention.eclass: installing firefox extensions and language packs
 
@@ -48,7 +48,8 @@
 	x="${1}"
 	cd ${x}
 	# determine id for extension
-	emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' ${x}/install.rdf) || die "failed to determine extension id"
+	emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \
+		|| die "failed to determine extension id"
 	insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid}
 	doins -r "${x}"/* || die "failed to copy extension"
 }