diff options
author | Norbert Preining <preining@logic.at> | 2008-01-21 14:01:37 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-01-21 14:01:37 +0000 |
commit | 237ebef5a9c81d83e962f1ce25ce31996d34f80b (patch) | |
tree | 0bd347a10fbe6843982662c94878cbe05041c802 | |
parent | 551f6f248ab5350365ce4f707ec021f820c16689 (diff) |
no charset cmd line
git-svn-id: svn://tug.org/texlive/trunk@6350 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/install-tl.pl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index 6d78e2d4f6b..638145339bc 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -48,24 +48,22 @@ use TeXLive::TLPDB; use TeXLive::TLConfig qw($DefaultContainerExtension $InfraLocation); use TeXLive::TLWinGoo; use Getopt::Long; +use utf8; +no utf8; # default language $::lang = "en"; -$::charset = "latin1"; if ($^O !~ /^MSWin(32|64)$/i) { # we load POSIX and locale stuff require POSIX; import POSIX qw/locale_h/; - # now we try to deduce $::charset and $::lang + # now we try to deduce $::lang my $loc = setlocale(&POSIX::LC_CTYPE); my ($lang,$area,$codeset); if ($loc =~ m/^([^_.]*)(_([^.]*))?(\.([^@]*))?(@.*)?$/) { $lang = defined($1)?$1:""; - $area = defined($3)?$3:""; - $codeset = defined($5)?$5:""; } $::lang = $lang if ($lang); - $::charset = $codeset if ($codeset); } use strict; @@ -148,7 +146,6 @@ GetOptions("media=s" => \$opt_media, "netarchive=s" => \$::netarchive, "diskarchive=s" => \$::diskarchive, "lang=s" => \$::lang, - "charset=s" => \$::charset, "d" => \$opt_debug, "dd" => \$opt_ddebug, "ddd" => \$opt_dddebug, |