diff options
author | Norbert Preining <preining@logic.at> | 2008-10-30 09:55:45 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-10-30 09:55:45 +0000 |
commit | 5ca47aa863d89a7a386f66acb78bce462b838093 (patch) | |
tree | 1de45e033b32ee66d3ff1f9b7889ff182b12dfaa /Master/tlpkg | |
parent | 419905649c72ed9353135ba933fd349bc7d86919 (diff) |
remove tl-update-makeself, it is anyway bad,
only install lzma(dec) and wget binaries for those archs we need
git-svn-id: svn://tug.org/texlive/trunk@11126 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tl-makeself-from-tlnet | 9 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-makeself | 169 |
2 files changed, 9 insertions, 169 deletions
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet index a50a5079016..ed313cc3a39 100755 --- a/Master/tlpkg/bin/tl-makeself-from-tlnet +++ b/Master/tlpkg/bin/tl-makeself-from-tlnet @@ -57,14 +57,23 @@ cat > runme.sh <<'EOF' ROOT=`kpsewhich --var-value=SELFAUTOPARENT` if [ -r "$ROOT/tlpkg/texlive.tlpdb" ] ; then mv ./master/bin . + my ./master/tlpkg/installer . cp -a ./master/* $ROOT/ # now try to get the list of installed architectures by listing the # directories in $ROOT/bin tlpobjs="$ROOT/tlpkg/tlpobj/bin-texlive.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.tlpobj" + mkdir -p $ROOT/tlpkg/installer/lzma + mkdir -p $ROOT/tlpkg/installer/wget for a in $ROOT/bin/* ; do b=`basename $a` cp -a bin/$b $ROOT/bin/ tlpobjs="$tlpobjs $ROOT/tlpkg/tlpobj/bin-texlive.$b.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.$b.tlpobj" + # we also have to copy the files from (tlpkg/)installer/lzma and ../wget + cp -a installer/lzma/lzmadec.$b $ROOT/tlpkg/installer/lzma + cp -a installer/lzma/lzma.$b $ROOT/tlpkg/installer/lzma + if [ -r installer/wget/wget.$b ] ; then + cp -a installer/wget/wget.$b $ROOT/tlpkg/installer/wget + fi done else # could be made more intelligent diff --git a/Master/tlpkg/bin/tl-update-makeself b/Master/tlpkg/bin/tl-update-makeself deleted file mode 100755 index 68ca22615fb..00000000000 --- a/Master/tlpkg/bin/tl-update-makeself +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env perl -# $Id$ -# Copyright 2008 Norbert Preining -# This file is licensed under the GNU General Public License version 2 -# or any later version. -# -# Creates a .run file for updating the texlive.infra and bin-texlive packages -# comparable to the windows .exe updater - -BEGIN { - $^W = 1; - ($mydir = $0) =~ s,/[^/]*$,,; - unshift (@INC, "$mydir/.."); -} - -our $mydir; - -use strict; - -use TeXLive::TLConfig; -use TeXLive::TLUtils; -use TeXLive::TLPOBJ; -use TeXLive::TLPDB; -use Getopt::Long; -use Pod::Usage; -use File::Path; -use Cwd; - -my $help = 0; - -TeXLive::TLUtils::process_logging_options(); - -GetOptions("help|?" => \$help) or pod2usage(1); -pod2usage(-exitstatus => 0, -verbose => 2) if $help; - -exit (&main ()); - - -sub main -{ - # get the db. - chomp (my $Master = `cd $mydir/../.. && pwd`); - my $tlpdb = TeXLive::TLPDB->new ("root" => $Master); - die("Cannot find tlpdb in $Master\n") unless defined($tlpdb); - my @packs = (); - my $bintexlive = $tlpdb->get_package("bin-texlive"); - my $texliveinfra = $tlpdb->get_package("texlive.infra"); - push @packs, $bintexlive; - push @packs, $texliveinfra; - - for my $a ($tlpdb->available_architectures) { - next if $a eq "win32"; - my $foo = $tlpdb->get_package("bin-texlive.$a"); - push @packs, $foo if defined($foo); - my $bar = $tlpdb->get_package("texlive.infra.$a"); - push @packs, $bar if defined($bar); - } - - my @allfiles = (); - for my $p (@packs) { - push @allfiles, $p->all_files; - } - - my $tmpdir = `mktemp -d`; - chomp($tmpdir); - for my $f (@allfiles) { - if ($f !~ m!/!) { - $f = "./$f"; - } - my ($dn, $fn) = TeXLive::TLUtils::dirname_and_basename($f); - system("mkdir -p \"$tmpdir/master/$dn\""); - system("cp -a \"$Master/$f\" \"$tmpdir/master/$f\""); - } - - # get highest rev of all these packages. - my $rev = 0; - for my $p (@packs) { - $rev = $p->revision if $rev < $p->revision; - } - - # we have to create the tlpobj files, too - my $tlpobjdir = "$InfraLocation/tlpobj"; - if (! -d "$tmpdir/master/$tlpobjdir") { - &TeXLive::TLUtils::mkdirhier("$tmpdir/master/$tlpobjdir"); - } - for my $p (@packs) { - open(TMP,">$tmpdir/master/$tlpobjdir/$p->{'name'}.tlpobj") or die "Cannot create $tmpdir/master/$tlpobjdir/$p->{'name'}.tlpobj"; - $p->writeout(\*TMP); - close(TMP); - } - - open (RUN, ">$tmpdir/runme.sh") or die "Cannot create $tmpdir/runme.sh: $!"; - print RUN <<'EOF'; -#!/bin/sh -# -# updater for tlmgr and infrastructure on unix -# - -ROOT=`kpsewhich --var-value=SELFAUTOPARENT` -if [ -r "$ROOT/tlpkg/texlive.tlpdb" ] ; then - mv ./master/bin . - cp -a ./master/* $ROOT/ - # now try to get the list of installed architectures by listing the - # directories in $ROOT/bin - tlpobjs="$ROOT/tlpkg/tlpobj/bin-texlive.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.tlpobj" - for a in $ROOT/bin/* ; do - b=`basename $a` - cp -a bin/$b $ROOT/bin/ - tlpobjs="$tlpobjs $ROOT/tlpkg/tlpobj/bin-texlive.$b.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.$b.tlpobj" - done -else - # could be made more intelligent - echo "Cannot find root, please call the .run script with --noexec --keep and" - echo "then call the runme.sh script in the unpacked directory with the" - echo "root as the first argument, i.e., someting like" - echo " sh runme.sh /your/path/to/the/texlive/installaton/2008" - exit 1 -fi - -tlmgr _include_tlpobj $tlpobjs - -EOF - - close(RUN); - system("chmod ugo+x \"$tmpdir/runme.sh\""); - - system("makeself \"$tmpdir\" update-texlive-${rev}.run \"TeX Live Manager Updater ${rev}\" ./runme.sh"); - - return(0); -} - - -__END__ - -=head1 NAME - -tl-create-makeself - creates a .run file for bin-texlive and texlive.infra - -=head1 SYNOPSIS - -tl-create-makeself [OPTION]... - -=head1 OPTIONS - -Only the standard options B<-help> and B<-q>, B<-v>, and -B<-logfile>=I<file> are accepted; see the C<process_logging_options> -function in L<TeXLive::TLUtils> for details. - -There should be an option for the destination of the .run file. - -=head1 DESCRIPTION - -Creates an updater for Unix systems for the central TeX Live packages -using makeself. - -=head1 AUTHORS AND COPYRIGHT - -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. - -=cut - -### Local Variables: -### perl-indent-level: 2 -### tab-width: 2 -### indent-tabs-mode: nil -### End: -# vim:set tabstop=2 expandtab: # |