merge language menu into regular collections menu

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

1 files changed, 1 insertions, 20 deletions

diff --git a/Master/install-tl b/Master/install-tl
index c0cdebaaafa..b6d9d2bacbb 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -114,7 +114,6 @@ my $default_scheme='scheme-full';
 # some arrays where the lists of collections to be installed are saved
 # our for menus
 our @collections_std;
-our @collections_lang;
 
 # The global variable %vars is an associative list which contains all
 # variables and their values which can be changed by the user.
@@ -1430,13 +1429,7 @@ sub initialize_collections {
     if ($tlpobj->category eq "Collection") {
       $vars{"$pkg"}=0;
       ++$vars{'n_collections_available'};
-      if ($pkg=~/collection-lang/) {
-        push @collections_lang, $pkg;
-      } elsif ($pkg =~ /documentation/) {
-        push @collections_std, $pkg;
-      } else {
-        push @collections_std, $pkg;
-      }
+      push (@collections_std, $pkg);
     }
   }
   my $scheme_tlpobj = $tlpdb->get_package($default_scheme);
@@ -1876,18 +1869,6 @@ sub flushlog {
   }
 }
 
-sub check_on_lang_collection_installed {
-  # we check that at least one lang collection is installed:
-  foreach my $c (@collections_lang) {
-    return 1 if $vars{"$c"};
-  }
-  if ($vars{"selected_scheme"} eq "scheme-context") {
-    # context
-    return 1;
-  }
-  return 0;
-}
-
 sub do_cleanup {
   # now open the log file and write out the log lines if needed.
   # the user could have given the -logfile option in which case all the