summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-06-11 17:57:59 +0000
committerNorbert Preining <preining@logic.at>2010-06-11 17:57:59 +0000
commitee3bc684018411a6d14fcfe366a5638a6664db25 (patch)
tree0c69f99d1087e6e5bb2e2469d95c8c0785c39608 /Master/install-tl
parentbdf353f3dd54fc55a1f36c89d04397534ecdebb6 (diff)
tlmgr: support --no-execute-actions cmd line that suppresses the
execute actions from tlpsrc files TLUtils.pm: announce_execute_actions: return if the global $::no_execute_actions is set. This global var is set from tlmgr when --no-execute-actions is given install-tl: use tlmgr --no-execute-actions paper letter to configure installation for paper format letter, and run fmtutil-sys --all separate Also move the call to mktexlsr (rerunning it) below the tlmgr paper letter call. git-svn-id: svn://tug.org/texlive/trunk@18898 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl18
1 files changed, 11 insertions, 7 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 37dc1d896b3..27a0adb63b9 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -804,18 +804,23 @@ operations might be disturbed.\n\n";
# system('updmap-sys', '--nohash');
log(`updmap-sys --nohash 2>&1`);
info("done\n");
- info("re-running mktexlsr $TEXMFSYSVAR\n");
- system('mktexlsr', "$TEXMFSYSVAR");
# now work through the options if specified at all
# letter instead of a4
if ($vars{'option_letter'}) {
+ # set paper size, but do not execute any post actions, in this case
+ # it would be:
+ # - mktexlsr
+ # - fmtutil-sys -all
info("setting default paper size to letter\n");
- system("tlmgr", "paper", "letter");
- # mind that this calls fmtutil-sys --all in tlmgr!!!
+ log(`tlmgr --no-execute-actions paper letter 2>&1`);
}
+ # now rerun mktexlsr for updmap-sy and tlmgr paper letter updates
+ info("re-running mktexlsr $TEXMFSYSVAR\n");
+ system('mktexlsr', "$TEXMFSYSVAR");
+
# luatex/context
# we only call luatools --generate once at installation time, the
# rest must be managed by the user, Taco email 2010-05-26
@@ -830,9 +835,8 @@ operations might be disturbed.\n\n";
# info("done\n");
#}
- # all formats option, if we have called tlmgr paper letter above, we
- # do not call fmtutil-sys again, it would be a waste of time
- if ($vars{'option_fmt'} && !$vars{'option_letter'}) {
+ # all formats option
+ if ($vars{'option_fmt'}) {
info("pre-generating all format files (fmtutil-sys --all), be patient...");
log(`fmtutil-sys --all 2>&1`);
info("done\n");