summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-08-06 01:30:01 +0000
committerNorbert Preining <preining@logic.at>2018-08-06 01:30:01 +0000
commit446ad0df71b4bdd2b9d5d5baea71344246aaa5da (patch)
treefdb761c941f3e59658de3750010d232901dfe93e
parentacba20d5c50da8be67673199c488155ab0db4d88 (diff)
tlmgr: only run mtxrun when luatex is available (custom-bin support)
git-svn-id: svn://tug.org/texlive/trunk@48358 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS2
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl6
2 files changed, 5 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 4e30fdf7f1e..522fcec34af 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -9,7 +9,7 @@ Karl Berry, 2010.)
<li>prefer system provided binaries over TL provided binaries for
compressor and download programs.
<li>save alias information from TeX Catalogue.
-
+<li>only run mtxrun if luatex is available.
<p><b>tlmgr 47951 (released 07jun18):</b>
<li>Backup removal for non-xz.
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 054ceb3a6a1..6186f921a8c 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -10,6 +10,7 @@ my $datrev = '$Date$';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
+my $bindir;
if ($svnrev =~ m/: ([0-9]+) /) {
$tlmgrrevision = $1;
} else {
@@ -46,7 +47,7 @@ BEGIN {
# Unix-specific problems with use as library will probably go undetected.
# make subprograms (including kpsewhich) have the right path:
- my ($bindir, $kpsewhichname);
+ my $kpsewhichname;
if ($^O =~ /^MSWin/i) {
# on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative
$Master = __FILE__;
@@ -848,7 +849,8 @@ sub handle_execute_actions {
if ($::files_changed) {
$errors += do_cmd_and_check("mktexlsr");
- if (defined($localtlpdb->get_package('context'))) {
+ if (defined($localtlpdb->get_package('context'))
+ && (-x "$bindir/luatex" || -x "$bindir/luatex.exe")) {
$errors += do_cmd_and_check("mtxrun --generate");
}
$::files_changed = 0;