From c28c7539001073b4476ba9d5a8cf68a913115fce Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 22 Apr 2021 00:44:39 +0000 Subject: fmtutil: put most important command at head of invocation git-svn-id: svn://tug.org/texlive/trunk@58948 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/texlive/tlmgr.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 78221b0616d..02ff3a26f0f 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -867,12 +867,13 @@ sub handle_execute_actions { my $errors = 0; my $sysmode = ($opts{"usermode"} ? "-user" : "-sys"); - my $invoke_fmtutil = "fmtutil$sysmode $common_fmtutil_args"; + my $fmtutil_cmd = "fmtutil$sysmode"; + my $fmtutil_args = $common_fmtutil_args; # of create_formats is unset (NOT the default) we add --refresh so that # only existing formats are recreated if (!$localtlpdb->option("create_formats")) { - $invoke_fmtutil .= " --refresh"; + $fmtutil_args .= " --refresh"; debug("only existing formats will be refreshed per user option (create_formats=0)\n"); } @@ -973,7 +974,7 @@ sub handle_execute_actions { for my $e (keys %updated_engines) { debug ("updating formats based on $e\n"); $errors += do_cmd_and_check - ("$invoke_fmtutil --no-error-if-no-format --byengine $e"); + ("$fmtutil_cmd --byengine $e --no-error-if-no-format $fmtutil_args"); } # now rebuild all other formats for my $f (keys %do_enable) { @@ -981,7 +982,7 @@ sub handle_execute_actions { # ignore disabled formats next if !$::execute_actions{'enable'}{'formats'}{$f}{'mode'}; debug ("(re)creating format dump $f\n"); - $errors += do_cmd_and_check ("$invoke_fmtutil --byfmt $f"); + $errors += do_cmd_and_check ("$fmtutil_cmd --byfmt $f $fmtutil_args"); $done_formats{$f} = 1; } } @@ -1000,7 +1001,7 @@ sub handle_execute_actions { $lang = "$TEXMFSYSVAR/tex/generic/config/$lang"; } if (!$::regenerate_all_formats) { - $errors += do_cmd_and_check ("$invoke_fmtutil --byhyphen \"$lang\""); + $errors += do_cmd_and_check ("$fmtutil_cmd --byhyphen \"$lang\" $fmtutil_args"); } } } @@ -1009,8 +1010,8 @@ sub handle_execute_actions { # so we just refresh formats instead of generating all that have not been there if ($::regenerate_all_formats) { info("Regenerating available formats, this may take some time ..."); - # --refresh might already be in $invoke_fmtutil, but we don't care - $errors += do_cmd_and_check("$invoke_fmtutil --refresh --all"); + # --refresh might already be in $fmtutil_args, but we don't care + $errors += do_cmd_and_check("$fmtutil_cmd --all --refresh $fmtutil_args"); info("done\n"); $::regenerate_all_formats = 0; } -- cgit v1.2.3