diff options
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl | 39 | ||||
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 8 |
2 files changed, 34 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 0ef264c2ac7..4bf66b2c952 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 37190 2015-05-04 23:36:23Z karl $ +# $Id: fmtutil.pl 37485 2015-05-23 16:52:36Z karl $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -9,7 +9,6 @@ # # History: # Original shell script (C) 2001 Thomas Esser, public domain -# my $TEXMFROOT; @@ -26,11 +25,11 @@ BEGIN { } -my $svnid = '$Id: fmtutil.pl 37190 2015-05-04 23:36:23Z karl $'; -my $lastchdate = '$Date: 2015-05-05 01:36:23 +0200 (Tue, 05 May 2015) $'; +my $svnid = '$Id: fmtutil.pl 37485 2015-05-23 16:52:36Z karl $'; +my $lastchdate = '$Date: 2015-05-23 18:52:36 +0200 (Sat, 23 May 2015) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 37190 $'; +my $svnrev = '$Revision: 37485 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "r$svnrev ($lastchdate)"; @@ -285,8 +284,27 @@ sub callback_build_formats { my $notavail = 0; # # set up a tmp dir - my $tmpdir = File::Temp::tempdir(CLEANUP => 1); - #my $tmpdir = File::Temp::tempdir(); + # On W32 it seems that File::Temp creates restrictive permissions (ok) + # that are copied over with the files created inside it (not ok). + # So make our own temp dir. + my $tmpdir; + if (win32()) { + my $foo; + for my $i (1..5) { + $foo = "$texmfvar/temp.$$." . int(rand(1000000)); + if (! -d $foo) { + if (mkdir($foo)) { + $tmpdir = $foo; + last; + } + } + } + if (! $tmpdir) { + die "Cannot get a temporary directory after five iterations ... sorry!"; + } + } else { + $tmpdir = File::Temp::tempdir(CLEANUP => 1); + } # set up destination directory $opts{'fmtdir'} || ( $opts{'fmtdir'} = "$texmfvar/web2c" ) ; TeXLive::TLUtils::mkdirhier($opts{'fmtdir'}) if (! -d $opts{'fmtdir'}); @@ -295,12 +313,11 @@ sub callback_build_formats { exit (1); } # since the directory does not exist, we can make it absolute with abs_path - # without andy trickery around non-existing dirs + # without any trickery around non-existing dirs $opts{'fmtdir'} = Cwd::abs_path($opts{'fmtdir'}); # for safety, check again die ("abs_path didn't succeed, that is strange: $?") if !$opts{'fmtdir'}; - # # code taken over from the original shell script for KPSE_DOT etc my $thisdir = cwd(); $ENV{'KPSE_DOT'} = $thisdir; @@ -356,6 +373,10 @@ sub callback_build_formats { print_info("Not available formats: $notavail\n") if ($notavail); print_info("Failure during builds: $err\n") if ($err); chdir($thisdir) || warn("chdir($thisdir) failed: $!"); + if (win32()) { + # try to remove the tmpdir with all files + TeXLive::TLUtils::rmtree($tmpdir); + } return 0; } diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 038608ab973..11741c5e5d8 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 37289 2015-05-09 02:43:37Z preining $ +# $Id: tlmgr.pl 37488 2015-05-23 17:58:40Z karl $ # # Copyright 2008-2015 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 37289 $'; -my $datrev = '$Date: 2015-05-09 04:43:37 +0200 (Sat, 09 May 2015) $'; +my $svnrev = '$Revision: 37488 $'; +my $datrev = '$Date: 2015-05-23 19:58:40 +0200 (Sat, 23 May 2015) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -4880,7 +4880,7 @@ sub check_files { # 00texlive.image, q.v. The ones here are not included in the # archival source/ tarball; my @IgnorePatterns = qw! - source/ + release-texlive.txt source/ texmf-dist/ls-R$ texmf-doc/ls-R$ tlpkg/archive tlpkg/backups tlpkg/installer tlpkg/texlive.tlpdb tlpkg/tlpobj tlpkg/texlive.profile |