[Fedora-livecd-list] 3 commits - docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh

[Jim Meyering]

Warren Togami 砥上勇 wrote:
>  docs/livecd-iso-to-disk.pod |    8 ++++++--
>  tools/livecd-iso-to-disk.sh |   10 +++++-----
>  2 files changed, 11 insertions(+), 7 deletions(-)
>
> New commits:
> commit e22eee657156d205c10ddbc93afdb006d8152b97
> Author: Bernie Innocenti <bernie at codewiz.org>
> Date:   Sun Nov 22 22:31:23 2009 -0500
>
>     LANG=C when parted output is being scraped, as localized strings cause it to fail.

Hi Bernie,

Please use LC_ALL=C for this sort of thing, not LANG=C, since
LC_ALL trumps all other envvars, including LANG.  For example,

    $ LC_ALL=fr_FR.UTF-8 LANG=C /bin/cat no-such
    /bin/cat: no-such: Aucun fichier ou dossier de ce type


> diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
...
> -    partinfo=$(/sbin/parted --script -m $device "unit b print" |grep ^$device:)
> +    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)


>From fc8b39c586b5f88440ebb78acc64b6a40807ba64 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 1 Dec 2009 10:19:10 +0100
Subject: [PATCH] livecd-iso-to-disk.sh: use LC_ALL=C, not LANG=C, since...

* tools/livecd-iso-to-disk.sh: ...LC_ALL trumps all other envvars,
including LANG.  For example,
  $ LC_ALL=fr_FR.UTF-8 LANG=C /bin/cat no-such
  /bin/cat: no-such: Aucun fichier ou dossier de ce type
---
 tools/livecd-iso-to-disk.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 95ca158..3a4726d 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -147,7 +147,7 @@ createGPTLayout() {
     read
     umount ${device}? &> /dev/null
     /sbin/parted --script $device mklabel gpt
-    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
     /sbin/parted --script $device unit b mkpart '"EFI System Partition"' fat32 17408 $(($size - 17408)) set 1 boot on
     USBDEV=${device}1
@@ -169,7 +169,7 @@ createMSDOSLayout() {
     read
     umount ${device}? &> /dev/null
     /sbin/parted --script $device mklabel msdos
-    partinfo=$(LANG=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
     /sbin/parted --script $device unit b mkpart primary fat32 17408 $(($size - 17408)) set 1 boot on
     USBDEV=${device}1
@@ -192,7 +192,7 @@ checkGPT() {
        exitclean
     fi

-    partinfo=$(LANG=C /sbin/parted --script -m $device "print" |grep ^$partnum:)
+    partinfo=$(LC_ALL=C /sbin/parted --script -m $device "print" |grep ^$partnum:)
     volname=$(echo $partinfo |cut -d : -f 6)
     flags=$(echo $partinfo |cut -d : -f 7)
     if [ "$volname" != "EFI System Partition" ]; then
--
1.6.6.rc0.324.gb5bf2