From 7e5585bcd4f8ba119cad8f0a7e13b6a7a610776f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 12 May 2009 15:53:11 +0000 Subject: Move most of the stuff from tlpkg, tlmgr from branch to trunk git-svn-id: svn://tug.org/texlive/trunk@13054 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/check-tlnet-consistency | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Master/tlpkg/bin/check-tlnet-consistency') diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency index 07ce83c08c1..81e5481859c 100755 --- a/Master/tlpkg/bin/check-tlnet-consistency +++ b/Master/tlpkg/bin/check-tlnet-consistency @@ -49,13 +49,13 @@ sub main # set up the programs ... if ($opt_nosetup) { # do a minimal setup - $::progs{'lzma'} = "lzma"; + $::progs{'xz'} = "xz"; $::progs{'tar'} = "tar"; } else { # do a full setup my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer"); if ($ret == -1) { - tlwarn("no binary of lzmadec for $::_platform_ detected, aborting.\n"); + tlwarn("no binary of xzdec for $::_platform_ detected, aborting.\n"); exit 1; } if (!$ret) { @@ -82,16 +82,16 @@ sub main my %filedifferrors; foreach my $pkg ($tlpdb->list_packages()) { next if ($pkg =~ m/^00texlive/); - my $cont = "$opt_location/archive/$pkg.tar.lzma"; - my $srccont = "$opt_location/archive/$pkg.source.tar.lzma"; - my $doccont = "$opt_location/archive/$pkg.doc.tar.lzma"; + my $cont = "$opt_location/archive/$pkg.tar.xz"; + my $srccont = "$opt_location/archive/$pkg.source.tar.xz"; + my $doccont = "$opt_location/archive/$pkg.doc.tar.xz"; my $tlpdbtlpobj = $tlpdb->get_package($pkg); my $dodoc = ($tlpdb->config_doc_container && $tlpdbtlpobj->docfiles); my $dosrc = ($tlpdb->config_src_container && $tlpdbtlpobj->srcfiles); if ($opt_filelists) { - system("cat $cont | $::progs{lzmadec} | $::progs{tar} -C \"$temp\" -xf - "); + system("cat $cont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - "); } else { - system("cat $cont | $::progs{lzmadec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); + system("cat $cont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); } if (! -r "$temp/tlpkg/tlpobj/$pkg.tlpobj") { push @notlpobj, $pkg; @@ -101,7 +101,7 @@ sub main die "Cannot load tlpobj from $temp/$pkg.tlpobj: $!" unless defined($tartlpobj); # get the src and doc containers unpacked and add the respective files if ($dosrc) { - system("cat $srccont | $::progs{lzmadec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); + system("cat $srccont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); if (! -r "$temp/tlpkg/tlpobj/$pkg.source.tlpobj") { push @missingsrccontainer, $pkg; } else { @@ -112,7 +112,7 @@ sub main } } if ($dodoc) { - system("cat $doccont | $::progs{lzmadec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); + system("cat $doccont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj"); if (! -r "$temp/tlpkg/tlpobj/$pkg.doc.tlpobj") { push @missingdoccontainer, $pkg; } else { @@ -191,7 +191,7 @@ sub main } } if (@sizeerror) { - print "packages with wrong container size/md5s:\n"; + print "packages with wront container size/md5s:\n"; for my $p (@sizeerror) { print "$p\n"; } @@ -268,7 +268,7 @@ default is C<./tlnet>. =item B<-no-setup> -Does not try to setup the various programs, but uses I and I +Does not try to setup the various programs, but uses I and I from path. =item B<-help> -- cgit v1.2.3