summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-22 11:08:20 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-22 11:08:20 +0000
commit37efdf11a95708cbd74b4eed1d4364477270fdb4 (patch)
tree99ac4811e8670346e0ce4266cd825a09f634e1c4
parent37a1aa390d85d550967fddfa75b341a06f66fcb2 (diff)
adding LC_ALL=C to ctan2tl
git-svn-id: svn://tug.org/texlive/trunk@8928 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl1
-rwxr-xr-xMaster/tlpkg/bin/place6
2 files changed, 4 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index ff4b8d78187..bb120442e62 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -5,6 +5,7 @@
# Attempt to push a package from CTAN into TL.
unset CDPATH # avoid extraneous output
+export LC_ALL=C # avoid problems with diff, comm, etc
mydir=`cd \`dirname $0\` && pwd` # Master/tlpkg/bin
PATH=$mydir:$PATH # we call lots of our other tools
diff --git a/Master/tlpkg/bin/place b/Master/tlpkg/bin/place
index 1db145c34f2..f617f6bee95 100755
--- a/Master/tlpkg/bin/place
+++ b/Master/tlpkg/bin/place
@@ -114,13 +114,13 @@ if (!defined($tlpold)) {
foreach (sort @newfiles) {
`echo $_ >> $TMP/tlplace.new`;
}
- print `LC_ALL=C comm -3 $TMP/tlplace.new $TMP/tlplace.old`;
- my @difffiles = `LC_ALL=C comm -12 $TMP/tlplace.new $TMP/tlplace.old`;
+ print `comm -3 $TMP/tlplace.new $TMP/tlplace.old`;
+ my @difffiles = `comm -12 $TMP/tlplace.new $TMP/tlplace.old`;
chomp (@difffiles);
my $sum = 0;
my $diff_file = "$TMP/tlplace.diff";
unlink ($diff_file);
- my $diff_cmd = "LC_ALL=C diff --text --strip-trailing-cr --ignore-all-space -U 0 -s";
+ my $diff_cmd = "diff --text --strip-trailing-cr --ignore-all-space -U 0 -s";
foreach (@difffiles) {
my @foo = `$diff_cmd $M/$_ $cooked/$package/$_ | tee -a $diff_file`;
$sum += $#foo; # zero-based, so first line doesn't count.