separate pre-running and done-running notices onto separate lines, for the benefit of TeX Live Utility (from Adam Maxwell, 20 Aug 2009)

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

3 files changed, 15 insertions, 8 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 7706ca67618..4922870ee28 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -460,14 +460,20 @@ sub execute_action {
 
 
 
-
-sub do_cmd_and_check {
+# run CMD with notice to the user and if exit status is nonzero, complain.
+# return exit status.
+# 
+sub do_cmd_and_check
+{
   my $cmd = shift;
-  info("running $cmd ... ");
+  # we output the pre-running notice on a separate line so that
+  # tlmgr front ends (MacOSX's TeX Live Utility) can read it
+  # and show it to the user before the possibly long delay.
+  info("running $cmd ...\n");
   my ($out, $ret) = TeXLive::TLUtils::run_cmd("$cmd 2>&1");
   if ($ret == 0) {
-    info("done\n");
-    log("Output of $cmd:\n$out\n");
+    info("done running $cmd.\n");
+    log("--output of $cmd:\n$out\n--end of output of $cmd.");
   } else {
     info("\n");
     tlwarn("$cmd failed (status $ret), output:\n$out\n");
@@ -482,8 +488,8 @@ sub do_cmd_and_check {
 # If the "map" key is specified, the value may be a reference to a list
 # of map command strings to pass to updmap, e.g., "enable Map=ascii.map".
 #
-sub handle_execute_actions {
-
+sub handle_execute_actions
+{
   my $errors = 0;
 
   if ($::files_changed) {
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 6638b95b904..70cd69f9d67 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -122,7 +122,7 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     $download http://www.uoregon.edu/~koch/$tlname.tar.gz;;
    powerpc-linux)
-    default_bin_loc=/home/tschmitz/powerpc-linux.tar.bz2;;
+    default_bin_loc=/home/tschmitz/powerpc.tar.bz2;;
    sparc-linux)
     default_bin_loc=/home/karl/s.tgz;;
    win32)
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index c2b71467d0e..ae7858591b4 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -139,6 +139,7 @@ unexpected_output=`cat install.log \
   | grep -Ev '^writing language.(dat|def) data to' \
   | grep -Ev '^pre-generating all format file' \
   | grep -Ev '^running ' \
+  | grep -Ev '^done running ' \
   | grep -Ev '^finished ' \
   | grep -Ev '^ See' \
   | grep -Ev '^  .*/index.html' \