From 807d135d3f1ab7bfd3fc070a2468db975e706ed5 Mon Sep 17 00:00:00 2001 From: Siep Kroonenberg Date: Mon, 12 Jun 2017 13:23:16 +0000 Subject: Hopefully __ is now handled right. git-svn-id: svn://tug.org/texlive/trunk@44571 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 51 +++++++++++++---------------- Master/tlpkg/installer/install-menu-text.pl | 6 ++-- Master/tlpkg/installer/tracked-install.pl | 4 +-- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 6b588ba6b61..771335e0db6 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -202,7 +202,7 @@ $::fileassocdesc[2] = "All"; # if we find a file installation.profile we ask the user whether we should # continue with the installation -# note, we are in the installer directory. +# note, we are in the directory from which the aborted installation was run. my %profiledata; if (-r "installation.profile") { my $pwd = Cwd::getcwd(); @@ -563,7 +563,8 @@ if ($opt_profile eq "") { tlwarn("Unknown return value of run_menu: $ret\n"); exit(3); } -} else { +} else { # no interactive setting of options + *__ = \&::___; if (!do_remote_init()) { die ("Exiting installation.\n"); } @@ -587,7 +588,7 @@ $::env_warns = ""; check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"}; create_welcome(); my $status = 1; -if ($opt_gui eq 'text' or +if ($opt_gui eq 'text' or $opt_profile ne "" or !(-r "$::installerdir/tlpkg/installer/tracked-install.pl")) { $status = do_installation(); if (@::WARNLINES) { @@ -596,8 +597,7 @@ if ($opt_gui eq 'text' or if ($::env_warns) { print STDERR $::env_warns; } unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) { foreach my $t (@::welcome_arr) { - printf STDOUT sprintf (shift @$t, @$t); - print STDOUT "\n"; + print STDOUT "$t\n"; } } do_cleanup(); # sets $::LOGFILENAME if not already defined @@ -2361,32 +2361,19 @@ EOF # Create a welcome message. -# This is an array of references to anonymous arrays of parameters for -# either __ or sprintf: a localizable string, possibly with placeholders, -# followed by parameters for those placeholders, if any. -# sub create_welcome { @::welcome_arr = (); - push @::welcome_arr, (["\nWelcome to TeX Live!\n"]); - push @::welcome_arr, [ <tagConfigure('centered', -justify => 'center'); # basic welcome message foreach my $t (@::welcome_arr) { - my $s = shift @$t; - $::progressw->insert("end", __($s, @$t)."\n", 'centered'); + #my $s = shift @$t; + $::progressw->insert("end", "$t\n", 'centered'); } $::progressw->insert("end", "\n"); # additional info -- cgit v1.2.3