implement new setup_programs, and add cleanup stuff to TLUtils, and use

it in install-tl and tlmgr


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

1 files changed, 6 insertions, 11 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index c0b26016eb0..f483509f8a3 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2431,6 +2431,9 @@ sub check_collections {
 # 
 # set global $location variable.
 # if we cannot read tlpdb, die if arg SHOULD_I_DIE is true.
+#
+# if an argument is given and is true init_local_db will die if 
+# setting up of programs failed.
 # 
 sub init_local_db {
   my ($should_i_die) = @_;
@@ -2438,17 +2441,8 @@ sub init_local_db {
   die("cannot find tlpdb in $Master") unless (defined($localtlpdb));
   # setup the programs, for w32 we need the shipped wget/lzma etc, so we
   # pass the location of these files to setup_programs.
-  my $ret = setup_programs("$Master/tlpkg/installer",
-                           $localtlpdb->option_platform);
-  if ($ret == -1) {
-    tlwarn("no binary of lzmadec for $::_platform_ detected.\n");
-    if (defined($should_i_die) && $should_i_die) {
-      exit 1;
-    } else {
-      tlwarn("Continuing anyway ...\n");
-    }
-  }
-  if (!$ret) {
+  if (!setup_programs("$Master/tlpkg/installer", 
+                      $localtlpdb->option_platform)) {
     tlwarn("Couldn't set up the necessary programs.\nInstallation of packages is not supported.\nPlease report to texlive\@tug.org.\n");
     if (defined($should_i_die) && $should_i_die) {
       finish(1);
@@ -2525,6 +2519,7 @@ sub finish {
   if ($::gui_mode) {
     return($ret);
   } else {
+    &TeXLive::TLUtils::cleanup();
     exit($ret);
   }
 }