Rename: forgot this one

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

1 files changed, 18 insertions, 17 deletions

diff --git a/Master/install-tl b/Master/install-tl
index e81a6801cb7..79e7948e04d 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -312,7 +312,7 @@ if ($opt_print_arch) {
 # continuing with normal install
 
 # check as soon as possible for GUI functionality to give people a chance
-# tp interrupt.
+# to interrupt.
 if (($opt_gui ne "text") && !$opt_no_gui && ($opt_profile eq "")) {
   # try to load Tk.pm, but don't die if it doesn't work
   eval { require Tk; };
@@ -390,19 +390,20 @@ if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
   # remove trailing \ or / (e.g. root of dvd drive on w32)
   $location =~ s,[\\\/]$,,;
   if (-d "$location/$Archive") {
-    push @media_available, 'CD';
+    push @media_available, 'local_compressed';
   }
 
   if (-d "$location/texmf/web2c") {
-    push @media_available, 'DVD';
+    push @media_available, 'local_uncompressed';
   }
 
-  if (member('CD', @media_available)) {
-    $media = 'CD';
-    # for from_dvd option we want DVD media if possible
-    $media = 'DVD' if $opt_from_dvd && member('DVD', @media_available);
-  } elsif (member('DVD', @media_available)) {
-    $media = 'DVD';
+  if (member('local_compressed', @media_available)) {
+    $media = 'local_compressed';
+    # for from_dvd option we want local_uncompressed media if possible
+    $media = 'local_uncompressed' if
+      $opt_from_dvd && member('local_uncompressed', @media_available);
+  } elsif (member('local_uncompressed', @media_available)) {
+    $media = 'local_uncompressed';
   } else {
     if ($opt_location) {
       # user gave a --location but nothing can be found there, so die
@@ -426,9 +427,9 @@ if ($opt_custom_bin) {
           . "with TeX Live binaries.\n");
   }
 }
-if ($media eq "DVD") {
+if ($media eq "local_uncompressed") {
   info("Distribution: live (uncompressed)\n");
-} elsif ($media eq "CD") {
+} elsif ($media eq "local_compressed") {
   info("Distribution: inst (compressed)\n");
 } elsif ($media eq "NET") {
   info("Distribution: net  (downloading)\n");
@@ -439,7 +440,7 @@ if ($media eq "DVD") {
 }
 info("Directory for temporary files: $system_tmpdir\n");
 
-if ($opt_from_dvd and ($media ne "DVD")) {
+if ($opt_from_dvd and ($media ne "local_uncompressed")) {
   print "Not running from DVD; 'from_dvd' option not applicable\n";
   $opt_from_dvd = 0;
 }
@@ -452,13 +453,13 @@ log("Installer revision: $::installerrevision\n");
 log("Database revision: " . $tlpdb->config_revision . "\n");
 
 # correctly set the splitting support
-# for DVD we always support splitting
-if (($media eq "NET") || ($media eq "CD")) {
+# for local_uncompressed we always support splitting
+if (($media eq "NET") || ($media eq "local_compressed")) {
   $vars{'src_splitting_supported'} = $tlpdb->config_src_container;
   $vars{'doc_splitting_supported'} = $tlpdb->config_doc_container;
 }
 $texlive_release = $tlpdb->config_release;
-if ($media eq "DVD") {
+if ($media eq "local_uncompressed") {
   # existing installation may not have 00texlive.config metapackage
   # so use TLConfig to establish what release we have
   $texlive_release ||= $TeXLive::TLConfig::ReleaseYear;
@@ -868,7 +869,7 @@ operations might be disturbed.\n\n";
   # now do the system integration:
   # on unix this means setting up symlinks
   # on w32 this means adding to path, settting registry values
-  # on both, we run the postaction directives of the tlp
+  # on both, we run the postaction directives of the tlpdb
   do_tlpdb_postactions();
 }
 
@@ -1779,7 +1780,7 @@ sub do_cleanup {
   }
 
   # remove temporary files from TEXDIR/temp
-  if (($media eq "CD") or ($media eq "NET")) {
+  if (($media eq "local_compressed") or ($media eq "NET")) {
     debug("Remove temporary downloaded containers...\n");
     rmtree("$vars{'TEXDIRW'}/temp") if (-d "$vars{'TEXDIRW'}/temp");
   }