From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NRZgE-0005ZM-15 for mharc-grub-devel@gnu.org; Sun, 03 Jan 2010 18:16:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRZgC-0005Y4-9V for grub-devel@gnu.org; Sun, 03 Jan 2010 18:16:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRZg7-0005UQ-8m for grub-devel@gnu.org; Sun, 03 Jan 2010 18:16:11 -0500 Received: from [199.232.76.173] (port=51567 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRZg7-0005UB-66 for grub-devel@gnu.org; Sun, 03 Jan 2010 18:16:07 -0500 Received: from iona.labri.fr ([147.210.8.143]:53004) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NRZg6-0003Wb-MS for grub-devel@gnu.org; Sun, 03 Jan 2010 18:16:07 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by iona.labri.fr (Postfix) with ESMTP id E9B0836B79 for ; Mon, 4 Jan 2010 00:16:04 +0100 (CET) X-Virus-Scanned: amavisd-new at labri.fr Received: from iona.labri.fr ([127.0.0.1]) by localhost (iona.labri.fr [127.0.0.1]) (amavisd-new, port 10027) with LMTP id BMVUYnc7cbB6 for ; Mon, 4 Jan 2010 00:16:04 +0100 (CET) Received: from [192.168.1.111] (c2433-1-88-160-112-182.fbx.proxad.net [88.160.112.182]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by iona.labri.fr (Postfix) with ESMTP id 9A10436B78 for ; Mon, 4 Jan 2010 00:16:04 +0100 (CET) Message-ID: <4B412533.10207@labri.fr> Date: Mon, 04 Jan 2010 00:16:03 +0100 From: =?ISO-8859-1?Q?Gr=E9goire_Sutre?= Organization: CNRS / LaBRI User-Agent: Thunderbird 2.0.0.23 (X11/20091027) MIME-Version: 1.0 To: The development of GNU GRUB References: <4B3B6B2D.70503@labri.fr> <20100101120336.GI3692@thorin> <4B3F52C1.6030201@labri.fr> <20100103165008.GG27698@thorin> <20100103165519.GI27698@thorin> In-Reply-To: <20100103165519.GI27698@thorin> Content-Type: multipart/mixed; boundary="------------050009080904010401040100" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: Config file generation failure on Linux (gettext.sh) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 23:16:12 -0000 This is a multi-part message in MIME format. --------------050009080904010401040100 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Robert Millan wrote: > On Sun, Jan 03, 2010 at 05:50:08PM +0100, Robert Millan wrote: >> As long as the script complains appropiately and exits non-zero if get= text >> was installed, I would consider it robust (keep in mind grub.cfg isn't > ^^^ >=20 > I meant "wasn't" of course. Ok, here is the new patch. This one also takes care of 10_kfreebsd, as=20 it uses gettext in the same way as 10_linux. Please let me know if I=20 missed something. Thanks, Gr=E9goire --------------050009080904010401040100 Content-Type: text/plain; name="patch-10_linux-gettext" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-10_linux-gettext" --- configure.ac.orig 2010-01-03 23:34:44.000000000 +0100 +++ configure.ac @@ -179,6 +179,7 @@ test "x$GCC" = xyes || AC_MSG_ERROR([GCC AC_GNU_SOURCE AM_GNU_GETTEXT([external]) +AC_PATH_PROG([GETTEXTBIN], [gettext], [echo]) AC_SYS_LARGEFILE # Identify characteristics of the host architecture. --- util/grub.d/10_kfreebsd.in.orig 2010-01-02 14:42:38.000000000 +0100 +++ util/grub.d/10_kfreebsd.in @@ -20,9 +20,14 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ +gettext=@GETTEXTBIN@ . ${libdir}/grub/grub-mkconfig_lib -. ${bindir}/gettext.sh +if [ "x${gettext}" != "xecho" ] && ! test -x "${gettext}" ; then + echo "10_kfreebsd: error: \`${gettext}' is missing." >&2 + exit 1 +fi + export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@ @@ -37,7 +42,7 @@ kfreebsd_entry () version="$2" recovery="$3" # not used yet args="$4" # not used yet - title="$(gettext "%s, with kFreeBSD %s")" + title="$(${gettext} "%s, with kFreeBSD %s")" printf "menuentry \"${title}\" {\n" "${os}" "${version}" if [ -z "${prepare_boot_cache}" ]; then prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" --- util/grub.d/10_linux.in.orig 2010-01-02 14:42:38.000000000 +0100 +++ util/grub.d/10_linux.in @@ -20,9 +20,14 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ +gettext=@GETTEXTBIN@ . ${libdir}/grub/grub-mkconfig_lib -. ${bindir}/gettext.sh +if [ "x${gettext}" != "xecho" ] && ! test -x "${gettext}" ; then + echo "10_linux: error: \`${gettext}' is missing." >&2 + exit 1 +fi + export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@ @@ -54,9 +59,9 @@ linux_entry () recovery="$3" args="$4" if ${recovery} ; then - title="$(gettext "%s, with Linux %s (recovery mode)")" + title="$(${gettext} "%s, with Linux %s (recovery mode)")" else - title="$(gettext "%s, with Linux %s")" + title="$(${gettext} "%s, with Linux %s")" fi printf "menuentry \"${title}\" {\n" "${os}" "${version}" if [ -z "${prepare_boot_cache}" ]; then --------------050009080904010401040100--