summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-08-07 00:02:22 +0000
committerKarl Berry <karl@freefriends.org>2008-08-07 00:02:22 +0000
commitdf6bc3e2f9ee2df7d9c3cd970aa801478f1a99de (patch)
tree852f56b89a4413ce04765fd43ca88e0499e68ed6
parentcf36d7a74e67df3e737afb753356c38faf0458b8 (diff)
tlpkg-ctan-check: non-verbose by default; ctan2tl: better way to show tds path
git-svn-id: svn://tug.org/texlive/trunk@10130 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl3
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check11
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo5
3 files changed, 9 insertions, 10 deletions
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index ea200c8e17c..5b2c9ae60d0 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -60,6 +60,9 @@ fi
echo "$0: ctan dir for $pkg"
echo "$0: is $ctan_dir1"
+test -r "$ctan_dir1/TDS_READY" \
+&& echo "$0: from `cat $ctan_dir1/TDS_READY`"
+
if egrep " $pkg"'( |$)' $mydir/tlpkg-ctan-check >/dev/null; then :; else
echo
echo "*** $0: $pkg not in $mydir/tlpkg-ctan-check, add?"
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 3d9b731380a..a32994510bc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -17,6 +17,7 @@ use File::Basename;
my $tlpdb;
my $TL;
+our %OPT;
my @WorkingTLP = qw(
12many
@@ -230,7 +231,7 @@ sub main
$tlpdb = TeXLive::TLPDB->new ("root" => "$Master");
die("Cannot find tlpdb in $Master!\n") unless defined($tlpdb);
- $OPT{"verbose"} = 1;
+ $OPT{"verbose"} = 0;
if ($ARGV[0] eq "--list-not-treated") {
print "List of tlps which are not in ctan-check:\n";
@@ -240,14 +241,12 @@ sub main
}
exit 0;
} elsif ($ARGV[0] eq "--check") {
- $OPT{"verbose"} = 0;
# for now, just check the few packages we have worked with.
@ARGV = @WorkingTLP;
} elsif ($ARGV[0] eq "--check-all") {
- $OPT{"verbose"} = 0;
@ARGV = &normal_tlps;
- } elsif ($ARGV[0] eq "--non-verbose") {
- $OPT{"verbose"} = 0;
+ } elsif ($ARGV[0] eq "--verbose") {
+ $OPT{"verbose"} = 1;
shift @ARGV;
}
@@ -284,7 +283,7 @@ sub do_tlp
my $tlp = $tlpdb->get_package($tlpn);
if (not(defined($tlp))) {
- warn("Cannot get package $tlpn, strange!\n");
+ warn "$0: no package $tlpn\n";
return 1;
}
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index a6304fc1268..67cf631717b 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -246,14 +246,11 @@ sub prepare
return $ctan_loc unless (-s $tds_path);
- # report what we're using. has to be on stderr since ctan2tl uses stdout.
- warn "$0: unzip -q $tds_path ...\n";
-
# now we have a tds, so unzip it in a tmpdir
my $tmpdir = &copy_to_tmpdir ($pkg);
system ("unzip -q $tds_path -d $tmpdir");
# put a flag for ctan2tds' donormal() to work
- system ("touch $tmpdir/TDS_READY");
+ system ("echo $tds_path >$tmpdir/TDS_READY");
# more problems with amsmath: we got all three packages together,
# we now have to remove the unwanted ones...