report source and target directories, not install-tl location

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

2 files changed, 7 insertions, 6 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 10c66ac819c..db8545428c3 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -158,9 +158,9 @@ $::alternative_selector = 0;
 
 # if we find a file installation.profile we ask the user whether we should
 # continue with the installation
-# note, we are in the installer directory!
+# note, we are in the installer directory.
 if (-r "installation.profile") {
-  print "ABORTED INSTALLATION FOUND: $localpath/installation.profile!!!\n";
+  print "ABORTED INSTALLATION FOUND: $localpath/installation.profile\n";
   print "Do you want to continue with the exact same settings as before (y/N): ";
   my $answer = <STDIN>;
   if ($answer =~ m/^y(es)?$/i) {
@@ -346,7 +346,7 @@ if ($location =~ m!^(http|ftp)://!i) {
     $media = 'NET';
   }
 }
-
+info("Installing from: $location\n");
 
 info("Platform: ", platform, " => \'", platform_desc(platform), "\'\n");
 if ($media eq "DVD") {
@@ -359,8 +359,7 @@ if ($media eq "DVD") {
 } else {
   info("Distribution: $media\n");
 }
-info("Directory for temporary files: '", $system_tmpdir, "\'\n");
-info("Installer directory: '$localpath'\n");
+info("Directory for temporary files: $system_tmpdir\n");
 
 if ($opt_from_dvd and ($media ne "DVD")) {
   print "Not running from DVD; 'from_dvd' option not applicable\n";
@@ -476,6 +475,7 @@ if (!$finished) {
   # in case it is the root of a drive
   $vars{'TEXDIR'} =~ s![/\\]$!!;
   $vars{'TEXDIRW'} =~ s![/\\]$!!;
+  info("Installing to: $vars{TEXDIR}\n");
   do_installation();
 }
 
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index ad4d0dc1f78..582abe7beae 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -104,11 +104,12 @@ perl install-tl -location $tlwebtry -profile texlive.profile >install.log 2>&1\
 # thus be noticed.
 unexpected_output=`cat install.log \
   | grep -Ev '^Automated TeX Live installation using profile' \
+  | grep -Ev '^Installing from:' \
   | grep -Ev '^Platform: ' \
   | grep -Ev '^Distribution: inst' \
   | grep -Ev '^Directory for temporary files' \
-  | grep -Ev '^Installer directory:' \
   | grep -Ev '^Loading ' \
+  | grep -Ev '^Installing to:' \
   | grep -Ev '^Installing: ' \
   | grep -Ev '^(re-)?running mktexlsr' \
   | grep -Ev '^mktexlsr: Updating ' \