Move most of the stuff from tlpkg, tlmgr from branch to trunk

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

54 files changed, 128 insertions, 73 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 5d1134c64a0..93c3ba90b5a 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # $Id$
 #
-# Copyright 2008 Norbert Preining, Reinhard Kotucha
+# Copyright 2008, 2009 Norbert Preining
+# Copyright 2008 Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -62,7 +63,6 @@ my $texmfsysconfigtext;
 my $texmfhometext;
 my $texdirtext;
 my $langcoltext;
-my $symlinktext;
 my $optletterstate;
 my $optfmtstate;
 my $optsrcstate;
@@ -70,6 +70,7 @@ my $optdocstate;
 my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
 my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
 my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
+my $deskintyesno = ( $vars{'option_desktop_integration'} ? $text{'yes'} : $text{'no'} );
 my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
 
 $::run_menu = \&run_menu_perltk;
@@ -258,15 +259,13 @@ sub run_menu_perltk {
     $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
+  $row++;
+  $fr->Label(-text => $labels{'desktop_integration'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+  $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
   if (unix()) {
-    $row++;
-    # Symlinks
-    $fr->Label(-text => "------- $text{'sysint'} -------")->grid(-row => $row, -column => 1,-columnspan => 3);
-
-    $row++;
-    $fr->Label(-text => $labels{'symlink'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-    $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m");
     $fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+  } else {
+    $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
   # install/cancel buttons
@@ -596,7 +595,7 @@ sub menu_select_lang_collections {
 
 sub menu_select_symlink {
   our ($lbin,$lman,$linfo);
-  our $osym = $vars{'option_symlinks'};
+  our $osym = $vars{'option_desktop_integration'};
   our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
   sub set_unset_buttons {
     $lbin = ($osym ? $vars{'sys_bin'} : '');
@@ -630,8 +629,8 @@ sub menu_select_symlink {
       $vars{'sys_info'} = $linfo;
       $vars{'sys_man'} = $lman;
     }
-    $vars{'option_symlinks'} = $osym;
-    menu_update_texts();
+    $vars{'option_desktop_integration'} = $osym;
+    toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno);
   }
   my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'});
   $sw->transient($mainwindow);
@@ -695,10 +694,6 @@ sub menu_set_text {
   $w->configure(-text => $t, @_);
 }
 
-sub menu_set_symlink_text {
-  menu_set_text($symlinktext, (($vars{'option_symlinks'})?$text{'yes'}:$text{'no'}));
-}
-
 sub menu_set_schemebutton_text {
   menu_set_text($schemebutton, "$vars{'selected_scheme'}");
 }
@@ -762,7 +757,6 @@ sub menu_update_texts {
   $optfmtstate = ($vars{'option_fmt'} ? $text{'yes'} : $text{'no'});
   $optsrcstate = ($vars{'option_src'} ? $text{'yes'} : $text{'no'});
   $optdocstate = ($vars{'option_doc'} ? $text{'yes'} : $text{'no'});
-  if (unix()) { menu_set_symlink_text; };
 }
 
 sub callback_select_scheme {
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 87c99474789..f87a0924fb1 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,7 +2,8 @@
 # $Id$
 # install-menu-txt.pl
 #
-# Copyright 2007, 2008 Reinhard Kotucha, Norbert Preining
+# Copyright 2007, 2008 Reinhard Kotucha
+# Copyright 2007, 2008, 2009 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -12,6 +13,7 @@ use vars qw(@::end_install_hook $::opt_no_cls);
 
 our %vars;
 our $tlpdb;
+our $previoustlpdb;
 our @collections_std;
 our @collections_lang;
 our @collections_lang_doc;
@@ -109,6 +111,25 @@ sub prompt {
 # The menu loop. A menu is a function.  Its return value is a
 # reference to another menu or to itself.
 sub run_menu_text {
+  my (@args) = @_;
+  # the text mode installer does not take interest in any argument 
+  # but the -old-installation-found
+  while (@args) {
+    my $f = shift @args;
+    if ($f eq "-old-installation-found") {
+      print "\nAn old installation of TeX Live has been found in ",
+            $previoustlpdb->root, "\n";
+      print "
+If you want the selection of collections and various options being taken
+over press `y', otherwise anything else.
+
+Import settings from previous TeX Live installation: (y/n): ";
+      chomp(my $yn = <STDIN>);
+      if ($yn =~ m/^y$/i) {
+        import_settings_from_old_tlpdb();
+      }
+    }
+  }
   my $menu=\&main_menu;
   while ($RETURN == $MENU_CONTINUE) {
     $menu=$menu->();
@@ -197,37 +218,28 @@ sub scheme_menu {
 
   menu_head 'Select a scheme:';
 
-  foreach my $pkg ($tlpdb->list_packages) {
-    my $tlpobj = $tlpdb->{'tlps'}{$pkg};
-    if ($tlpobj->category eq "Scheme") {
-      push @schemes, $pkg;
-      $vars{"$pkg"}=($vars{'selected_scheme'} eq $pkg)? 1:0;
-    }
+  foreach my $pkg ($tlpdb->schemes) {
+    push @schemes, $pkg;
+    $vars{"$pkg"}=($vars{'selected_scheme'} eq $pkg)? 1:0;
   }
   @schemes=sort @schemes;
+  push @schemes, "scheme-custom";
 
   foreach my $scheme (@schemes) {
     $keyval{$keys[$index]}="$scheme";
-    my $tlpobj = $tlpdb->get_package("$scheme");
-    printf " %s %s %s\n", $keys[$index], button($vars{"$scheme"}),
-    $tlpobj->shortdesc;
+    if ($scheme ne "scheme-custom") {
+      my $tlpobj = $tlpdb->get_package("$scheme");
+      printf " %s %s %s\n", $keys[$index], button($vars{"$scheme"}),
+             $tlpobj->shortdesc;
+    } else {
+      printf " %s %s custom selection of collections\n", 
+             $keys[$index], button($vars{'selected_scheme'} eq "scheme-custom");
+    }
     ++$index;
   }
 
-  foreach my $entry (keys %vars) {
-    if ($entry=~/^(collection-.*)/) {
-      $vars{"$1"}=0;
-    }
-  }
+  select_scheme($vars{'selected_scheme'});
 
-  my $scheme_tlpobj = $tlpdb->get_package($vars{'selected_scheme'});
-  if (defined ($scheme_tlpobj)) {
-    foreach my $dependent ($scheme_tlpobj->depends) {
-      if ($dependent=~/^(collection-.*)/) {
-        $vars{"$1"}=1;
-      }
-    }
-  }
   if ($vars{"binary_win32"}) {
     $vars{"collection-wintools"} = 1;
   } else {
@@ -239,6 +251,7 @@ sub scheme_menu {
 
   if (defined $keyval{"$answer"}) {
     $vars{'selected_scheme'}=$keyval{"$answer"};
+    select_scheme($vars{'selected_scheme'});
     return $command{'self'}->();
   }
   if (defined $command{"\u$answer"}) {
@@ -368,13 +381,13 @@ sub language_menu {
     my $tlpobj = $tlpdb->get_package("$language");
     $keyval{$lang_keys[$index]}="$language";
     printf " %s %s %-33s", $lang_keys[$index], button($vars{"$language"}),
-    substr($tlpobj->shortdesc,0,33);
+           substr($tlpobj->shortdesc,0,33);
     if (defined $languages[$index+$lines]) {
       my $language=$languages[$index+$lines];
       my $tlpobj = $tlpdb->get_package("$language");
       $keyval{$lang_keys[$index+$lines]}="$language";
       printf " %s %s %-32s\n", $lang_keys[$index+$lines],
-      button($vars{"$language"}), substr($tlpobj->shortdesc,0,32);
+             button($vars{"$language"}), substr($tlpobj->shortdesc,0,32);
     } else {
       print "\n";
     }
@@ -389,13 +402,13 @@ sub language_menu {
     my $tlpobj = $tlpdb->get_package("$lang_doc");
     $keyval{$lang_doc_keys[$index]}="$lang_doc";
     printf " %s %s %-33s", $lang_doc_keys[$index], button($vars{"$lang_doc"}),
-    substr($tlpobj->shortdesc,0,33);
+           substr($tlpobj->shortdesc,0,33);
     if (defined $lang_docs[$index+$lines]) {
       my $lang_doc=$lang_docs[$index+$lines];
       my $tlpobj = $tlpdb->get_package("$lang_doc");
       $keyval{$lang_doc_keys[$index+$lines]}="$lang_doc";
       printf " %s %s %-32s\n", $lang_doc_keys[$index+$lines],
-      button($vars{"$lang_doc"}), substr($tlpobj->shortdesc,0,32);
+             button($vars{"$lang_doc"}), substr($tlpobj->shortdesc,0,32);
     } else {
       print "\n";
     }
@@ -675,19 +688,22 @@ sub help_menu {
 
 
 sub options_menu {
-  my $b_symlinks=button($vars{'option_symlinks'});
+  my $b_path=button($vars{'option_path'});
   my $b_doc=button($vars{'option_doc'});
   my $b_src=button($vars{'option_src'});
   my $b_fmt=button($vars{'option_fmt'});
   my $b_letter=button($vars{'option_letter'});
+  my $b_deskint=button($vars{'option_desktop_integration'});
+  my $b_fileassocs=button($vars{'option_file_assocs'});
+  my $b_admin=button($vars{'option_w32_multi_user'});
 
   my $sys_bin=$vars{'sys_bin'};
   my $sys_man=$vars{'sys_man'};
   my $sys_info=$vars{'sys_info'};
 
-  my $t_sys_bin=($vars{'option_symlinks'})? $vars{'sys_bin'}:'';
-  my $t_sys_man=($vars{'option_symlinks'})? $vars{'sys_man'}:'';
-  my $t_sys_info=($vars{'option_symlinks'})? $vars{'sys_info'}:'';
+  my $t_sys_bin=($vars{'option_path'})? $vars{'sys_bin'}:'';
+  my $t_sys_man=($vars{'option_path'})? $vars{'sys_man'}:'';
+  my $t_sys_info=($vars{'option_path'})? $vars{'sys_info'}:'';
 
   my %command=(
     'self' => \&options_menu,
@@ -700,7 +716,7 @@ sub options_menu {
 
   print <<"EOF";
  <P> use letter size instead of A4 by default: $b_letter
- <F> create all format files:                  $b_fmt
+ <F> create format files:                      $b_fmt
 EOF
 ;
   if ($vars{'doc_splitting_supported'} and !$vars{'from_dvd'}) {
@@ -709,14 +725,29 @@ EOF
   if ($vars{'src_splitting_supported'} and !$vars{'from_dvd'}) {
     print " <S> install font/macro source tree:           $b_src\n";
   }
-  if (unix() && !$vars{'from_dvd'}) {
-    print <<"EOF";
- <L> create symlinks in standard directories:  $b_symlinks
+  if (!$vars{'from_dvd'}) {
+    if (unix()) {
+      print <<"EOF";
+ <L> create symlinks in standard directories:  $b_path
             binaries to: $t_sys_bin
             manpages to: $t_sys_man
                 info to: $t_sys_info
 EOF
 ;
+    } else {
+      print <<"EOF";
+ <L> adjust registry entry for path:           $b_path
+EOF
+;
+    }
+    if (win32()) {
+      print " <M> install menu items, shortcuts, etc:       $b_deskint\n";
+      print " <N> update file associations:                 $b_fileassocs\n";
+      if (admin()) {
+        # if we are admin we allow normal user installation, too
+        print " <U> make installation available to all users: $b_admin\n";
+      }
+    }
   }
   other_options qw(R Q diskspace);
   my $answer = prompt 'Enter command';
@@ -726,8 +757,8 @@ EOF
       my $home = getenv('HOME');
       $home = getenv('USERPROFILE') if (win32());
       $home ||= '~';
-      toggle 'option_symlinks';
-      if ($vars{'option_symlinks'}) {
+      toggle 'option_path';
+      if ($vars{'option_path'}) {
         print "New value for binary directory [$sys_bin]: ";
         chomp($answer=<STDIN>);
         $vars{'sys_bin'} =  "$answer" if (length $answer);
@@ -751,9 +782,28 @@ EOF
       }
       return $command{'self'};
     }
+  } else {
+    if (("\u$answer" eq 'L') and !$vars{'from_dvd'}) {
+      my $home = getenv('HOME');
+      $home = getenv('USERPROFILE') if (win32());
+      $home ||= '~';
+      toggle 'option_path';
+      return $command{'self'};
+    }
   }
+  if ("\u$answer" eq 'M') {
+    toggle 'option_desktop_integration';
+    return $command{'self'};
+
+  } elsif ("\u$answer" eq 'N') {
+    toggle 'option_file_assocs';
+    return $command{'self'};
+
+  } elsif ("\u$answer" eq 'U') {
+    toggle 'option_w32_multi_user';
+    return $command{'self'};
 
-  if ("\u$answer" eq 'P') {
+  } elsif ("\u$answer" eq 'P') {
     toggle 'option_letter';
     return $command{'self'};
 
@@ -802,11 +852,14 @@ sub dvd_hd_toggle {
 sub main_menu {
   my $this_platform=platform_desc($vars{'this_platform'});
 
-  my $b_symlinks=button($vars{'option_symlinks'});
+  my $b_path=button($vars{'option_path'});
   my $b_doc=button($vars{'option_doc'});
   my $b_src=button($vars{'option_src'});
   my $b_fmt=button($vars{'option_fmt'});
   my $b_letter=button($vars{'option_letter'});
+  my $b_deskint=button($vars{'option_desktop_integration'});
+  my $b_fileassocs=button($vars{'option_file_assocs'});
+  my $b_admin=button($vars{'option_w32_multi_user'});
 
   my $warn_nobin;
 
@@ -913,8 +966,15 @@ EOF
     if ($vars{'src_splitting_supported'}) {
       print "   $b_src install macro/font source tree\n";
     }
-    if (unix()) {
-      print "   $b_symlinks create symlinks in standard directories\n";
+    if (win32()) {
+      print "   $b_path adjust search path\n";
+      print "   $b_deskint add menu items, shortcuts, etc.\n";
+      print "   $b_fileassocs update file associations\n";
+      if (admin()) {
+        print "   $b_admin make installation available to all users\n";
+      }
+    } else {
+      print "   $b_path create symlinks to standard directories\n";
     }
   }
 
diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl
index 19a19fecf13..d05f78cce73 100644
--- a/Master/tlpkg/installer/install-translations.pl
+++ b/Master/tlpkg/installer/install-translations.pl
@@ -52,12 +52,12 @@ if (defined($::opt_lang)) {
 }
 
 
-our %text = (title      => 'TeX Live 2008 Installation',
+our %text = (title      => 'TeX Live 2009 Installation',
              basicinfo  => 'Basic Information',
              custom     => 'Further Customization',
              dirsetup   => "Directory setup",
              options    => 'Options',
-             sysint     => 'System Integration',
+             desktop_integration   => 'Desktop Integration',
              change     => 'Change',
              toggle     => 'Toggle',
              install    => 'Install TeX Live',
@@ -93,7 +93,7 @@ our %text = (title      => 'TeX Live 2008 Installation',
              welcome => 'Welcome to TeX Live!',
              next       => 'Next >',
              prev       => '< Back',
-             wizhello   => "Welcome to the installation of TeX Live 2008\n"
+             wizhello   => "Welcome to the installation of TeX Live 2009\n"
                . "http://tug.org/texlive\n\n"
                . "This wizard will guide you through the installation.\n\n"
                . "For an advanced, customizable installation, please consult\n"
@@ -101,7 +101,7 @@ our %text = (title      => 'TeX Live 2008 Installation',
              destfolder => 'Destination folder:',
              advcustom  => 'Advanced customization',
              pathinfo   => "The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.",
-             readyinst  => "We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
+             readyinst  => "We are ready to install TeX Live 2009.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
              instshort  => 'Install',
              wizard     => 'Go to Wizard',
     );
@@ -121,6 +121,7 @@ our %labels = (binsys   => 'Binary System(s)',
                optdoc   =>  'Install font/macro doc tree',
                optsrc   =>  'Install font/macro source tree',
                symlink  =>  'Create symlinks in system directories',
+             desktop_integration   => 'Desktop Integration',
     );
 
 if (($::lang ne "en") && ($::lang ne "C")) {
diff --git a/Master/tlpkg/installer/lang/perltk-cs b/Master/tlpkg/installer/lang/perltk-cs
index 60d0273fe72..7057eeadaba 100644
--- a/Master/tlpkg/installer/lang/perltk-cs
+++ b/Master/tlpkg/installer/lang/perltk-cs
@@ -14,7 +14,7 @@ text.basicinfo:    Základní informace
 text.custom:       Další úpravy
 text.dirsetup:     Nastavení adresářové struktury
 text.options:      Volby
-text.sysint:       Systémová integrace
+text.desktop_integration:       Systémová integrace
 text.change:       Změnit
 text.toggle:       Přepnout
 text.install:      Instalovat TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-de b/Master/tlpkg/installer/lang/perltk-de
index 90f36040dad..43767c40003 100644
--- a/Master/tlpkg/installer/lang/perltk-de
+++ b/Master/tlpkg/installer/lang/perltk-de
@@ -7,7 +7,7 @@ text.custom:       Weitere Einstellungen
 text.basicinfo:    Grundlegende Informationen
 text.dirsetup:     Setup der Ordner
 text.options:      Optionen
-text.sysint:       Systemintegration
+text.desktop_integration:       Systemintegration
 text.change:       Ändern
 text.toggle:       Ändern
 text.install:      TeX Live installieren
diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample
index 857edfef7a8..eb846ae006d 100644
--- a/Master/tlpkg/installer/lang/perltk-en.sample
+++ b/Master/tlpkg/installer/lang/perltk-en.sample
@@ -46,7 +46,7 @@ text.selectscheme: Select a scheme
 text.selectstdcol: Select the collections to be installed
 text.selectsys: Select arch-os
 text.status: Status output
-text.sysint: System Integration
+text.desktop_integration: Desktop Integration
 text.title: TeX Live 2008 Installation
 text.toggle: Toggle
 text.welcome: Welcome to TeX Live!
diff --git a/Master/tlpkg/installer/lang/perltk-fr b/Master/tlpkg/installer/lang/perltk-fr
index 7f7fbe1d668..df7a20c275a 100644
--- a/Master/tlpkg/installer/lang/perltk-fr
+++ b/Master/tlpkg/installer/lang/perltk-fr
@@ -8,7 +8,7 @@ text.basicinfo:		Informations générales
 text.custom:		Personnalisation avancée
 text.dirsetup:		Choix des répertoires
 text.options:		Options
-text.sysint:		Intégration du système
+text.desktop_integration:		Intégration du système
 text.change:		Changer
 text.toggle:		(Dé)sélectionner
 text.install:		Installer TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-it b/Master/tlpkg/installer/lang/perltk-it
index 16c7791137f..fc7123c8ba2 100644
--- a/Master/tlpkg/installer/lang/perltk-it
+++ b/Master/tlpkg/installer/lang/perltk-it
@@ -22,7 +22,7 @@ text.basicinfo:    Informazioni di Base
 text.custom:       Ulteriore Personalizzazione
 text.dirsetup:     Configurazione delle directory
 text.options:      Opzioni
-text.sysint:       Integrazione con il Sistema
+text.desktop_integration:       Integrazione con il Sistema
 text.change:       Cambia
 text.toggle:       Inverti
 text.install:      Installa TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-nl b/Master/tlpkg/installer/lang/perltk-nl
index 03c0284fae3..210ef439286 100644
--- a/Master/tlpkg/installer/lang/perltk-nl
+++ b/Master/tlpkg/installer/lang/perltk-nl
@@ -7,7 +7,7 @@ text.basicinfo:    Basisinformatie
 text.custom:       Verfijning
 text.dirsetup:     Folders
 text.options:      Opties
-text.sysint:       Systeem-integratie
+text.desktop_integration:       Systeem-integratie
 text.change:       Wijzig
 text.toggle:       Wijzig
 text.install:      Installeer TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-pl b/Master/tlpkg/installer/lang/perltk-pl
index 5b913aec03a..0650d97cc7a 100644
--- a/Master/tlpkg/installer/lang/perltk-pl
+++ b/Master/tlpkg/installer/lang/perltk-pl
@@ -6,7 +6,7 @@ text.custom:        Dalsze ustawienia
 text.basicinfo:     Informacje podstawowe
 text.dirsetup:      Wybór folderów
 text.options:       Opcje
-text.sysint:        Integracja systemu
+text.desktop_integration:        Integracja systemu
 text.change:        Zmień
 text.toggle:        Zmień
 text.install:       Zainstaluj TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-sl b/Master/tlpkg/installer/lang/perltk-sl
index bf0b0efb1d9..c63d6e6ecd0 100644
--- a/Master/tlpkg/installer/lang/perltk-sl
+++ b/Master/tlpkg/installer/lang/perltk-sl
@@ -8,7 +8,7 @@ text.basicinfo:    Osnovne nastavitve
 text.custom:       Napredne nastavitve
 text.dirsetup:     Nastavitve imenikov
 text.options:      Ostale možnosti
-text.sysint:       Integracija v sistem
+text.desktop_integration:       Integracija v sistem
 text.change:       Spremeni
 text.toggle:       Vključi/Izključi
 text.install:      Namesti TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-vi b/Master/tlpkg/installer/lang/perltk-vi
index 982ae6d0ef2..ffa2609fa0e 100644
--- a/Master/tlpkg/installer/lang/perltk-vi
+++ b/Master/tlpkg/installer/lang/perltk-vi
@@ -17,7 +17,7 @@ text.basicinfo:    Thông tin cơ bản
 text.custom:       Tinh chỉnh khác
 text.dirsetup:     Thư mục cài đặt
 text.options:      Tùy chọn
-text.sysint:       Tích hợp hệ thống
+text.desktop_integration:       Tích hợp hệ thống
 text.change:       Đổi
 text.toggle:       Toggle
 text.install:      Cài đặt TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-zh-cn b/Master/tlpkg/installer/lang/perltk-zh-cn
index 82e31cb29a9..3568de8289f 100644
--- a/Master/tlpkg/installer/lang/perltk-zh-cn
+++ b/Master/tlpkg/installer/lang/perltk-zh-cn
@@ -8,7 +8,7 @@ text.basicinfo:    基本信息
 text.custom:       进一步定制

 text.dirsetup:     目录设置

 text.options:      选项

-text.sysint:       系统集成

+text.desktop_integration:       系统集成

 text.change:       改变

 text.toggle:       切换

 text.install:      安装 TeX Live

diff --git a/Master/tlpkg/installer/lang/perltk-zh-tw b/Master/tlpkg/installer/lang/perltk-zh-tw
index ce6a1ce5415..7c1d89339a2 100644
--- a/Master/tlpkg/installer/lang/perltk-zh-tw
+++ b/Master/tlpkg/installer/lang/perltk-zh-tw
@@ -8,7 +8,7 @@ text.basicinfo:    基本資訊
 text.custom:       進一步定制

 text.dirsetup:     目錄設置

 text.options:      選項

-text.sysint:       系統集成

+text.desktop_integration:       系統集成

 text.change:       改變

 text.toggle:       切換

 text.install:      安裝 TeX Live

diff --git a/Master/tlpkg/installer/lzma/lzma.alpha-linux b/Master/tlpkg/installer/lzma/lzma.alpha-linux
deleted file mode 100755
index 57a33f4ff8d..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.alpha-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.amd64-freebsd b/Master/tlpkg/installer/lzma/lzma.amd64-freebsd
deleted file mode 100755
index bc8d0e33166..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.amd64-freebsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.exe b/Master/tlpkg/installer/lzma/lzma.exe
deleted file mode 100644
index f3f81891bfb..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.exe
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.hppa-hpux b/Master/tlpkg/installer/lzma/lzma.hppa-hpux
deleted file mode 100755
index 5b11c340f39..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.hppa-hpux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.i386-freebsd b/Master/tlpkg/installer/lzma/lzma.i386-freebsd
deleted file mode 100755
index 2757e59f4b9..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.i386-freebsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.i386-linux b/Master/tlpkg/installer/lzma/lzma.i386-linux
deleted file mode 100755
index 8cf5efbf978..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.i386-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.i386-openbsd b/Master/tlpkg/installer/lzma/lzma.i386-openbsd
deleted file mode 100755
index d8361493ab5..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.i386-openbsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.i386-solaris b/Master/tlpkg/installer/lzma/lzma.i386-solaris
deleted file mode 100755
index b80c86c30fb..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.i386-solaris
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.mips-irix b/Master/tlpkg/installer/lzma/lzma.mips-irix
deleted file mode 100755
index d07fee95753..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.mips-irix
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.powerpc-aix b/Master/tlpkg/installer/lzma/lzma.powerpc-aix
deleted file mode 100755
index 47e90df49c3..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.powerpc-aix
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.powerpc-linux b/Master/tlpkg/installer/lzma/lzma.powerpc-linux
deleted file mode 100755
index 626764f9111..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.powerpc-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.sparc-linux b/Master/tlpkg/installer/lzma/lzma.sparc-linux
deleted file mode 100755
index 4d24c9f4c66..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.sparc-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.sparc-solaris b/Master/tlpkg/installer/lzma/lzma.sparc-solaris
deleted file mode 100755
index 78318ee771a..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.sparc-solaris
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.universal-darwin b/Master/tlpkg/installer/lzma/lzma.universal-darwin
deleted file mode 100755
index 961d374d944..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.universal-darwin
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzma.x86_64-linux b/Master/tlpkg/installer/lzma/lzma.x86_64-linux
deleted file mode 100755
index 7efec830a52..00000000000
--- a/Master/tlpkg/installer/lzma/lzma.x86_64-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.alpha-linux b/Master/tlpkg/installer/lzma/lzmadec.alpha-linux
deleted file mode 100755
index 7d79085fa35..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.alpha-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd b/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd
deleted file mode 100755
index 732abc31f01..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.hppa-hpux b/Master/tlpkg/installer/lzma/lzmadec.hppa-hpux
deleted file mode 100755
index f36af86f445..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.hppa-hpux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.i386-freebsd b/Master/tlpkg/installer/lzma/lzmadec.i386-freebsd
deleted file mode 100755
index 31557983e54..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.i386-freebsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.i386-linux b/Master/tlpkg/installer/lzma/lzmadec.i386-linux
deleted file mode 100755
index 236c96924f9..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.i386-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.i386-openbsd b/Master/tlpkg/installer/lzma/lzmadec.i386-openbsd
deleted file mode 100755
index 8feb3679853..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.i386-openbsd
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.i386-solaris b/Master/tlpkg/installer/lzma/lzmadec.i386-solaris
deleted file mode 100755
index 42eac5e4554..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.i386-solaris
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.mips-irix b/Master/tlpkg/installer/lzma/lzmadec.mips-irix
deleted file mode 100755
index 7493774f81f..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.mips-irix
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix b/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix
deleted file mode 100755
index 7204970d7f9..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.powerpc-linux b/Master/tlpkg/installer/lzma/lzmadec.powerpc-linux
deleted file mode 100755
index 6e822ffb943..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.powerpc-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.sparc-linux b/Master/tlpkg/installer/lzma/lzmadec.sparc-linux
deleted file mode 100755
index 2d9658009f3..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.sparc-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris b/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris
deleted file mode 100755
index c276f77052d..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.universal-darwin b/Master/tlpkg/installer/lzma/lzmadec.universal-darwin
deleted file mode 100755
index 897487cb4e0..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.universal-darwin
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.win32.exe b/Master/tlpkg/installer/lzma/lzmadec.win32.exe
deleted file mode 100755
index f91c8eb26b5..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.win32.exe
+++ /dev/null
diff --git a/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux b/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux
deleted file mode 100755
index 884723f350c..00000000000
--- a/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux
+++ /dev/null
diff --git a/Master/tlpkg/installer/xz/xz.exe b/Master/tlpkg/installer/xz/xz.exe
new file mode 100755
index 00000000000..c4cb32e94e7
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.exe
diff --git a/Master/tlpkg/installer/xz/xz.i386-cygwin.exe b/Master/tlpkg/installer/xz/xz.i386-cygwin.exe
new file mode 100755
index 00000000000..09d47d21d52
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.i386-cygwin.exe
diff --git a/Master/tlpkg/installer/xz/xz.i386-linux b/Master/tlpkg/installer/xz/xz.i386-linux
new file mode 100755
index 00000000000..58029b1bb2e
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.i386-linux
diff --git a/Master/tlpkg/installer/xz/xz.universal-darwin b/Master/tlpkg/installer/xz/xz.universal-darwin
new file mode 100755
index 00000000000..82ed1b4cb96
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.universal-darwin
diff --git a/Master/tlpkg/installer/xz/xz.x86_64-linux b/Master/tlpkg/installer/xz/xz.x86_64-linux
new file mode 100755
index 00000000000..6ca200803ff
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.x86_64-linux
diff --git a/Master/tlpkg/installer/xz/xzdec.exe b/Master/tlpkg/installer/xz/xzdec.exe
new file mode 100755
index 00000000000..5023b5b9780
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.exe
diff --git a/Master/tlpkg/installer/xz/xzdec.i386-cygwin.exe b/Master/tlpkg/installer/xz/xzdec.i386-cygwin.exe
new file mode 100755
index 00000000000..590d93cc0f2
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.i386-cygwin.exe
diff --git a/Master/tlpkg/installer/xz/xzdec.i386-linux b/Master/tlpkg/installer/xz/xzdec.i386-linux
new file mode 100755
index 00000000000..52f1f5bd0f5
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.i386-linux
diff --git a/Master/tlpkg/installer/xz/xzdec.universal-darwin b/Master/tlpkg/installer/xz/xzdec.universal-darwin
new file mode 100755
index 00000000000..c1795bd7bcf
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.universal-darwin
diff --git a/Master/tlpkg/installer/xz/xzdec.x86_64-linux b/Master/tlpkg/installer/xz/xzdec.x86_64-linux
new file mode 100755
index 00000000000..2f0138d8acf
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.x86_64-linux