Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15e3920d693014f3d362d1ec4b4b531f8ccf3733

commit 15e3920d693014f3d362d1ec4b4b531f8ccf3733
Author: Michel Hermier <[email protected]>
Date:   Sat Jul 26 09:14:43 2014 +0200

mozilla-i18n.sh: Fix initialisation of _F_xpi_installpath and _F_xpi_product 
(avoid bug in xpi.sh that creates a dummy '-extensions' group).

diff --git a/source/include/mozilla-i18n.sh b/source/include/mozilla-i18n.sh
index 04f96f3..dd126b8 100644
--- a/source/include/mozilla-i18n.sh
+++ b/source/include/mozilla-i18n.sh
@@ -41,7 +41,8 @@ Finclude i18n
# * options()
# * up2date
# * url
-# * _F_xpi_installpath
+# * _F_xpi_installpath (if not set, defaults to 
/usr/lib/$_F_mozilla_i18n_name/$_F_mozilla_i18n_xulname/extensions/)
+# * _F_xpi_product (if not set, defaults to $_F_mozilla_i18n_name)
###
: ${pkgname="$_F_mozilla_i18n_name-i18n"} \
${pkgdesc="Language support for ${_F_mozilla_i18n_name^}"}
@@ -51,7 +52,8 @@ options=("${options[@]}" 'noversrc')
up2date="eval \"_F_archive_name=$_F_mozilla_i18n_name; Flastarchive 
$_F_mozilla_i18n_mirror/$_F_mozilla_i18n_dirname$_F_mozilla_i18n_name/releases/latest/source
 '\.source\.tar\.bz2'\""
url="http://www.mozilla.org/projects/l10n/mlp.html";

-_F_xpi_installpath="/usr/lib/$_F_mozilla_i18n_name/$_F_mozilla_i18n_xulname/extensions/"
+: 
${_F_xpi_installpath="/usr/lib/$_F_mozilla_i18n_name/$_F_mozilla_i18n_xulname/extensions/"}
 \
+  ${_F_xpi_product="$_F_mozilla_i18n_name"}

Finclude xpi

@@ -95,8 +97,6 @@ mozilla_i18n_lang_fini() {

mozilla_i18n_lang_install()
{
-       : ${_F_xpi_product="$_F_mozilla_i18n_name"}
-
Fxpi_installxpi "$Fsrcdir/$_F_mozilla_i18n_archive_name$1$_F_mozilla_i18n_ext"
Fxpi_installfixes
Fsplit "$_F_mozilla_i18n_name-${1,,}" "$_F_xpi_installpath"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to