summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-08-10 23:35:03 +0000
committerKarl Berry <karl@freefriends.org>2008-08-10 23:35:03 +0000
commite238c741ed2f68f0815534b370973e3b495fbfc9 (patch)
treeeadfd0d7fe299fe2d5e8e1f174d2418a2d4a6745
parentb57a2c0c2a95288b008ea19bc80de23854fa55aa (diff)
better removal of TDS_READY; make tlpkg-ctan-check formatting more consistent; different bin file upload location for i386-freebsd
git-svn-id: svn://tug.org/texlive/trunk@10235 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/TDS_READY0
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl2
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check41
3 files changed, 21 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/flowfram/TDS_READY b/Master/texmf-dist/doc/latex/flowfram/TDS_READY
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/TDS_READY
+++ /dev/null
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index 983d2369093..d8c2f7affec 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -105,7 +105,7 @@ ctan2tds --ctan-dir=$ctan_dir1 $pkg || exit 1
cd $cooked || exit 1
printf "\n\f cooked\n"
-rm -f $pkg/texmf*/TDS_READY # remove sentinel file
+find $pkg -name TDS_READY -exec rm '{}' \; # remove sentinel file
find -depth -type d | xargs rmdir 2>/dev/null # remove empty directories
find $pkg \! -type d -printf "%TY%Tm%Td.%TH%TM %p\n" | sort -k2
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 3b8e8f7c0af..4e417fdc5f5 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -16,7 +16,7 @@ use TeXLive::TLPDB;
use File::Basename;
my $tlpdb;
-my $TL;
+my $Master;
our %OPT;
my @WorkingTLP = qw(
@@ -218,37 +218,35 @@ my @WorkingTLP = qw(
york-thesis
ziffer zwgetfdate
);
-
exit (&main ());
sub main
{
- # get the Master dir
- chomp (my $Master = `cd $mydir/../.. && pwd`);
- $TL = $Master;
- # First we load the current texlive.tlpdb
- $tlpdb = TeXLive::TLPDB->new ("root" => "$Master");
- die("Cannot find tlpdb in $Master!\n") unless defined($tlpdb);
+ # get the Master dir and texlive.tlpdb
+ chomp ($Master = `cd $mydir/../.. && pwd`);
+ $tlpdb = TeXLive::TLPDB->new ("root" => $Master);
+ die "Cannot find tlpdb in $Master!" unless defined $tlpdb;
$OPT{"verbose"} = 0;
+ if ($ARGV[0] eq "--verbose") {
+ $OPT{"verbose"} = 1;
+ shift @ARGV;
+ }
if ($ARGV[0] eq "--list-not-treated") {
- print "List of tlps which are not in ctan-check:\n";
- foreach my $b (&normal_tlps) {
- my @foo = grep(/^$b$/, @WorkingTLP);
- print "$b\n" if ($#foo < 0);
+ print "TeX Live packages not in $0:\n";
+ for my $b (&normal_tlps ()) {
+ print "$b\n" if ! grep (/^$b$/, @WorkingTLP);
}
- exit 0;
+ @ARGV = (); # no normal checks
+
} elsif ($ARGV[0] eq "--check") {
- # for now, just check the few packages we have worked with.
+ # check all/only those packages we have actually run through this mill.
@ARGV = @WorkingTLP;
} elsif ($ARGV[0] eq "--check-all") {
- @ARGV = &normal_tlps;
- } elsif ($ARGV[0] eq "--verbose") {
- $OPT{"verbose"} = 1;
- shift @ARGV;
+ @ARGV = &normal_tlps ();
}
my $errcount = 0;
@@ -262,10 +260,11 @@ sub main
# gives a list with only the 'normal' packages,
# that is, excluding meta-packages and binary packages
# (and hyphen for the moment)
+#
sub normal_tlps
{
my @normal;
- my $non_normal = `ls $TL/bin`;
+ my $non_normal = `ls $Master/bin`;
$non_normal =~ s/\n/\$|/g;
$non_normal .= '^0+texlive|^bin-|^collection-|^scheme-|^texlive-|^hyphen-';
foreach ($tlpdb->list_packages) {
@@ -275,7 +274,7 @@ sub normal_tlps
}
-# Return 1 if TPM needs updating, 0 if ok.
+# Return 1 if package needs updating, 0 if ok.
#
sub do_tlp
{
@@ -302,7 +301,7 @@ sub do_tlp
my @compared = ();
for my $file (@tpm_files) {
#warn "checking file $file\n";
- my $tl_file = "$TL/$file";
+ my $tl_file = "$Master/$file";
if (! -e $tl_file) {
warn "$tl_file: TL file missing\n";
next;