l3build (7aug18)

git-svn-id: svn://tug.org/texlive/trunk@48367 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 9 insertions, 7 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 2107f024d3a..1ece096e7f3 100644
--- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2018-08-04"
+release_date = "2018-08-07"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index d2cfaaebbf3..5bd28758d4b 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,15 +1,16 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $
+# $Id: tlmgr.pl 48361 2018-08-06 21:44:39Z karl $
 #
 # Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 48271 $';
-my $datrev = '$Date: 2018-07-25 03:51:31 +0200 (Wed, 25 Jul 2018) $';
+my $svnrev = '$Revision: 48361 $';
+my $datrev = '$Date: 2018-08-06 23:44:39 +0200 (Mon, 06 Aug 2018) $';
 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/texlua" || -x "$bindir/texlua.exe")) {
       $errors += do_cmd_and_check("mtxrun --generate");
     }
     $::files_changed = 0;
@@ -9729,7 +9731,7 @@ This script and its documentation were written for the TeX Live
 distribution (L<http://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $
+$Id: tlmgr.pl 48361 2018-08-06 21:44:39Z karl $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html