summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-01-20 11:10:35 +0000
committerNorbert Preining <preining@logic.at>2009-01-20 11:10:35 +0000
commit39cdea5a4481ec6229b9fa0f26f5d9c4dc6fc10b (patch)
treecc2a473a0350837bf5242ed37a7ae2985bda8a8a
parentb5111169ac8d0ba399bda9a7f4b695023a14aeba (diff)
fixes, and updmap.cfg created in TEXMFSYSCONFIG
git-svn-id: svn://tug.org/texlive/trunk@11925 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl5
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm5
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl2
4 files changed, 5 insertions, 9 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 5c4161e2e76..ae8e3e8606c 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1051,9 +1051,10 @@ operations might be disturbed.\n\n";
"$TEXMFSYSVAR/web2c/fmtutil.cnf",
"$TEXMFLOCAL/web2c/fmtutil-local.cnf");
- info("writing updmap.cfg to $TEXMFSYSVAR/web2c/updmap.cfg\n");
+ mkdirhier "$vars{'TEXMFSYSCONFIG'}/web2c";
+ info("writing updmap.cfg to $TEXMFSYSCONFIG/web2c/updmap.cfg\n");
TeXLive::TLUtils::create_updmap ($tlp, #$localtlpdb,
- "$TEXMFSYSVAR/web2c/updmap.cfg",
+ "$TEXMFSYSCONFIG/web2c/updmap.cfg",
"$TEXMFLOCAL/web2c/updmap-local.cfg");
info("writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index b49bb9ae78c..b0d7e1f5b48 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -125,7 +125,7 @@ sub init_hooks {
sub update_status {
my ($p) = @_;
- $::progressw->insert("end", "$p\n");
+ $::progressw->insert("end", "$p");
$::progressw->see("end");
}
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 41b83cc8e9a..736d5b830df 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1685,7 +1685,6 @@ sub info {
my $str = join("", @_);
my $fh = ($::machinereadable ? \*STDERR : \*STDOUT);
logit($fh, 0, $str);
- chomp($str);
for my $i (@::info_hook) {
&{$i}($str);
}
@@ -1708,7 +1707,6 @@ sub debug {
my $str = "D:" . join("", @_);
return if ($::opt_verbosity < 1);
logit(\*STDOUT, 1, $str);
- chomp($str);
for my $i (@::debug_hook) {
&{$i}($str);
}
@@ -1731,7 +1729,6 @@ sub ddebug {
my $str = "DD:" . join("", @_);
return if ($::opt_verbosity < 2);
logit(\*STDOUT, 2, $str);
- chomp($str);
for my $i (@::ddebug_hook) {
&{$i}($str);
}
@@ -1754,7 +1751,6 @@ sub dddebug {
my $str = "DDD:" . join("", @_);
return if ($::opt_verbosity < 3);
logit(\*STDOUT, 3, $str);
- chomp($str);
for my $i (@::dddebug_hook) {
&{$i}($str);
}
@@ -1790,7 +1786,6 @@ sub tlwarn {
my $str = join("", @_);
$::opt_quiet = 0;
logit (\*STDERR, -100, $str);
- chomp($str);
$::opt_quiet = $savequiet;
for my $i (@::warn_hook) {
&{$i}($str);
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 4f0c5cc3020..fdbfa388329 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -119,7 +119,7 @@ push @::install_packages_hook,
sub update_status {
my ($p) = @_;
- $::progressw->insert("end", "$p\n");
+ $::progressw->insert("end", "$p");
$::progressw->see("end");
}
sub update_progressbar {