From 8b163cf7cf8d94453f08e2b3d14bee08664a4095 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Apr 2014 23:13:52 +0000 Subject: back to install-tl.zip, since it is cross-platform git-svn-id: svn://tug.org/texlive/trunk@33608 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-install-pkg | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg index 9ba69041d2d..453ad9655a5 100755 --- a/Master/tlpkg/bin/tl-update-install-pkg +++ b/Master/tlpkg/bin/tl-update-install-pkg @@ -1,7 +1,8 @@ #!/usr/bin/env perl # $Id$ # -# Copyright 2008, 2009, 2013 Reinhard Kotucha, Norbert Preining, Karl Berry +# Copyright 2008, 2009, 2013, 2014 +# Reinhard Kotucha, Norbert Preining, Karl Berry # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -206,7 +207,7 @@ sub make_zip { chomp (my $prevdir = `pwd`); &xchdir ($tmpdir); if ($type eq 'zip') { - &xsystem ('zip', '-rq', 'install-tl-windows.zip', $install_tl_name); + &xsystem ('zip', '-rq', 'install-tl.zip', $install_tl_name); } elsif ($type eq 'nsis') { # write include file for dated install directory. @@ -231,7 +232,8 @@ sub make_zip { sub install_files { $outputdir = abs_path ($outputdir); info ("$0: Installing to $outputdir\n"); - for my $f ("install-tl-unx.tar.gz", "install-tl-windows.zip", "install-tl-windows.exe") { + for my $f ("install-tl-unx.tar.gz", "install-tl.zip", + "install-tl-windows.exe") { copy ("$tmpdir/$f", $outputdir); system ("cd $outputdir && sha256sum $f >$f.sha256"); system ('ls', '-l', "$outputdir/$f"); @@ -250,7 +252,7 @@ sub install_files { # unpack in a temp directory. my $junkdir = "junkdir"; mkdir ($junkdir); - xsystem ("cd $junkdir && unzip -q $outputdir/install-tl-windows.zip"); + xsystem ("cd $junkdir && unzip -q $outputdir/install-tl.zip"); # move what we want and erase the rest. -d "tlpkg" -- cgit v1.2.3