diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-12 23:24:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-12 23:24:26 +0000 |
commit | 5d02e7e5bb31a915ae71344c2d6e147d75196074 (patch) | |
tree | a357686a91b8088139a991017fdc55eda5c68df1 /Master/tlpkg/bin | |
parent | 6e91a22282c9611244f76bf62ba8e615a1affa55 (diff) |
make tlpkg/tltcl windows-only in the patterns instead of excluding in the script
git-svn-id: svn://tug.org/texlive/trunk@49139 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-install-pkg | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg index 5821f0e131d..3c087d0dcc2 100755 --- a/Master/tlpkg/bin/tl-update-install-pkg +++ b/Master/tlpkg/bin/tl-update-install-pkg @@ -100,11 +100,9 @@ for my $signal (@signals) { } # create directories. - die "$tmpdir already exists" if -d $tmpdir; - -mkdir "$tmpdir" or die "Can't mkdir \"$tmpdir\".\n"; -mkdir "$inst_tmp" or die "Can't mkdir \"$inst_tmp\".\n"; +mkdir "$tmpdir" or die "Can't mkdir($tmpdir)"; +mkdir "$inst_tmp" or die "Can't mkdir($inst_tmp)"; if ($opt_verbose) { info("thisdir: \"$thisdir\"\n"); @@ -124,9 +122,9 @@ die "$0: Output directory not writable: $outputdir.\n" unless -w $outputdir; my $tlpdb = TeXLive::TLPDB->new ("root" => $installerdir); die "$0: Cannot find tlpdb in $installerdir.\n" unless defined $tlpdb; -my $tlp = $tlpdb->get_package("00texlive.installer"); +my $tlpinst = $tlpdb->get_package("00texlive.installer"); die "$0: no 00texlive.installer in ${installerdir}'s texlive.tlpdb" - unless defined $tlp; + unless defined $tlpinst; my $tlpinfra = $tlpdb->get_package("texlive.infra"); die "$0: no texlive.infra in ${installerdir}'s texlive.tlpdb" @@ -137,9 +135,9 @@ die "$0: no texlive-msg-translations in ${installerdir}'s texlive.tlpdb" unless defined $tlptrans; my @unix = (); -push @unix, $tlp->runfiles; -push @unix, grep (!/^texmf\//, $tlpinfra->runfiles); -push @unix, $tlp->docfiles; # doc +push @unix, $tlpinst->runfiles; +push @unix, grep (! /^texmf\//, $tlpinfra->runfiles); +push @unix, $tlpinst->docfiles; # doc push @unix, $tlptrans->runfiles; # translations # add the texlive-LL docs in pdf and html format if the option is given. @@ -156,7 +154,7 @@ if ($opt_texlivedocs) { } } -my %tlpbin = %{$tlp->binfiles}; +my %tlpbin = %{$tlpinst->binfiles}; for my $a (keys %tlpbin) { next if ($a =~ m/win32/); push (@unix, @{$tlpbin{$a}}); @@ -180,7 +178,7 @@ make_zip ("nsis"); install_files (); cleanup (); - +exit (0); # copy files from the repository to $inst_tmp. @@ -221,7 +219,7 @@ sub make_zip { &xsystem ("makensis -V4 install-tl >$tmpdir/install-tl-nsis.log"); } elsif ($type eq 'tgz') { - &xsystem ('tar', '-czf', 'install-tl-unx.tar.gz', '--exclude=tltcl', + &xsystem ('tar', '-czf', 'install-tl-unx.tar.gz', $install_tl_name); } else { |