Fix for from_dvd but still problem

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

1 files changed, 19 insertions, 18 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 2ede35a0e3b..2ca2bc52073 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -14,7 +14,7 @@
 #      testing for uncompressed live system ...
 #      testing for network access ...
 #      loading tlpdb, this can take some time ...
-#   (that, and maybe some others can be done with the waitVariableX 
+#   (that, and maybe some others can be done with the waitVariableX
 #   thingy as described in the Perl/Tk book in the chapter that can be
 #   found on the net)   (Werner 28.10.08)
 # - at the end of the installation after the welcome message if there
@@ -524,7 +524,7 @@ if (!$finished) {
   # in case it is the root of a drive
   $vars{'TEXDIR'} =~ s![/\\]$!!;
   $vars{'TEXDIRW'} =~ s![/\\]$!!;
-  info("Installing to: $vars{TEXDIR}\n");
+  info("Installing to: $vars{TEXDIRW}\n");
   do_installation();
 }
 
@@ -636,6 +636,7 @@ operations might be disturbed.\n\n";
     }
   }
   $ENV{'TEXMFSYSVAR'} = $vars{'TEXMFSYSVAR'} if $vars{'from_dvd'};
+  $ENV{'TEXMFSYSCONFIG'} = $vars{'TEXMFSYSCONFIG'} if $vars{'from_dvd'};
 
   # Step 2: Setup the PATH, switch to the new Perl
 
@@ -736,7 +737,7 @@ operations might be disturbed.\n\n";
   info("running mktexlsr $TEXMFSYSVAR\n");
   system('mktexlsr', "$TEXMFSYSVAR");
 
-  info("running updmap-sys... ");
+  info("running updmap-sys... \n");
   # system('updmap-sys', '--nohash');
   log(`updmap-sys --nohash 2>&1`);
   info("done\n");
@@ -760,7 +761,7 @@ operations might be disturbed.\n\n";
   }
 
   #
-  # do path adjustments: On Windows add/remove to PATH etc, on Unix 
+  # do path adjustments: On Windows add/remove to PATH etc, on Unix
   # set symlinks
   do_path_adjustments() if $vars{'option_path'};
 
@@ -778,7 +779,7 @@ sub do_tlpdb_postactions {
   my $usedtlpdb = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
   foreach my $package (sort keys %install) {
     if ($install{$package}) {
-      &TeXLive::TLUtils::do_postaction("install", 
+      &TeXLive::TLUtils::do_postaction("install",
                                        $usedtlpdb->get_package($package),
                                        $vars{'option_file_assocs'},
                                        $vars{'option_desktop_integration'},
@@ -800,7 +801,7 @@ sub do_path_adjustments {
     broadcast_env();
   } else {
     TeXLive::TLUtils::add_symlinks($vars{'TEXDIR'}, $vars{'this_platform'},
-      $vars{'option_sys_bin'}, $vars{'option_sys_man'}, 
+      $vars{'option_sys_bin'}, $vars{'option_sys_man'},
       $vars{'option_sys_info'});
   }
   info ("finished with path adjustment actions\n");
@@ -1383,28 +1384,28 @@ sub import_settings_from_old_tlpdb {
   #
   # now for the settings
   # set the defaults to what is specified in the tlpdb
-  $vars{'option_doc'} = 
+  $vars{'option_doc'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "install_docfiles");
-  $vars{'option_src'} = 
+  $vars{'option_src'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "install_srcfiles");
-  $vars{'option_fmt'} = 
+  $vars{'option_fmt'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "create_formats");
   $vars{'option_desktop_integration'} = 1 if win32();
   # option_path does not exist in older installation
-  $vars{'option_path'} = 
+  $vars{'option_path'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "create_symlinks");
   $vars{'option_path'} = 1 if win32();
-  $vars{'option_sys_bin'} = 
+  $vars{'option_sys_bin'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "sys_bin");
-  $vars{'option_sys_man'} = 
+  $vars{'option_sys_man'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "sys_man");
-  $vars{'sys_info'} = 
+  $vars{'sys_info'} =
     $previoustlpdb->option_pkg("00texlive-installation.config",
                                "sys_info");
   #
@@ -1561,7 +1562,7 @@ sub do_cleanup
 
 
 # portable option, invoked from tl-portable script.
-# 
+#
 sub do_portable {
   $::opt_verbosity = -1;
   $::_platform_ = platform();
@@ -1670,9 +1671,9 @@ L<http://tug.org/texlive/doc/install-tl.html>.
 =item B<-gui> [[=]I<module>]
 
 If no I<module> is given starts the default GUI installer (default on
-Windows). 
+Windows).
 
-If I<module> is given loads the given installer module. Currently the 
+If I<module> is given loads the given installer module. Currently the
 following modules are supported:
 
 =over 8
@@ -1695,7 +1696,7 @@ It can also be selected by giving the C<-gui> option without any I<module>.
 
 =back
 
-The C<perltk> and C<wizard> modules, and thus also when calling with a 
+The C<perltk> and C<wizard> modules, and thus also when calling with a
 simple C<-gui> (without I<module>) requires
 the Perl/Tk module (L<http://tug.org/texlive/distro.html#perltk>; if
 Perl/Tk is not available, installation continues in text mode.
@@ -1808,7 +1809,7 @@ menu list.
 In case your architecture is not supported by TeX Live out of the box
 and you have built your own binaries for your system, this option allows
 to give the I<path> to a directory where ready made binaries for your
-system are present. The installation will continue as normally, but at 
+system are present. The installation will continue as normally, but at
 the end all files from I<path> are copied over to C<bin/custom> in your
 installation folder and this directory will be added to the path for
 the postinstall actions.