grep in tlpkg-ctan-check and scheme-*.

git-svn-id: svn://tug.org/texlive/trunk@11198 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 6 deletions

diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm
index c7adf0d2211..280101511b2 100755
--- a/Master/tlpkg/bin/tlprm
+++ b/Master/tlpkg/bin/tlprm
@@ -74,15 +74,20 @@ sub main
     unlink ($commit_file);
     `printf "$removals" >$commit_file`;
 
-    my @lines = `grep -l 'depend.* $f\$' $Master/tlpkg/tlpsrc/collection-*`;
-    `printf "@lines" >>$commit_file`;
+    my $tsrc = "$Master/tlpkg/tlpsrc";
+    my @lines = `grep -l 'depend.* $f\$' $tsrc/collection-* $tsrc/scheme-*`;
     print "first edit collections:\n", @lines;
+    `printf "@lines" >>$commit_file`;
     
-    print "and if needed: $Master/tlpkg/bin/tlpkg-ctan-check\n";
-    `echo $Master/tlpkg/bin/tlpkg-ctan-check >>$commit_file`;
+    my $check_script = "$Master/tlpkg/bin/tlpkg-ctan-check";
+    @lines = `egrep '( |^)$f( |\$)' $check_script`;
+    if (@lines) {
+      print "and no future checks: $check_script\n";
+      `echo $check_script >>$commit_file`;
+    }
 
     # e.g., insert a die.
-    print "and to avoid resurrection: $Master/tlpkg/bin/ctan2tds\n";
+    print "and no resurrection:  $Master/tlpkg/bin/ctan2tds\n";
     `echo $Master/tlpkg/bin/ctan2tds >>$commit_file`;
 
     print "then:\nsvn remove `cat $rm_file`\n";
@@ -189,7 +194,8 @@ merged.  It does not actually run any commands, remove anything, or
 change the TeX Live package database or anything else.
 
 No dependency or other checking is done.  It also does not remove the
-given package from any collection(s) where it is present.
+given package from any collection(s) where it is present, although it
+reports any collections and schemes that have dependencies on the package.
 
 =head1 AUTHORS AND COPYRIGHT