summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl16
1 files changed, 14 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl
index a5f4a007a03..cedfcd39e4e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -4,7 +4,7 @@
# Copyright 2007, 2008 Reinhard Kotucha, Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-#
+#
# Be careful when changing wording: Every normal informational message
# output here must be recognized by the long grep in tl-update-tlnet.
@@ -228,7 +228,7 @@ if ($opt_profile) {
}
if ($opt_nonadmin and win32()) {
- non_admin();
+ non_admin();
}
# the TLPDB instances we will use. $tlpdb is for the one from the installation
@@ -482,7 +482,19 @@ sub do_installation {
do_install_packages();
}
if (win32()) {
+ my $path = TeXLive::TLWinGoo::get_system_env() -> {'/Path'};
+ $path =~ s/[\s\x00]+$//;
+ log("Old system path: $path\n");
+ $path = TeXLive::TLWinGoo::get_user_env() -> {'/Path'};
+ $path =~ s/[\s\x00]+$//;
+ log("Old user path: $path\n");
add_texbindir_to_path($vars{'TEXDIR'}.'/bin/win32');
+ $path = TeXLive::TLWinGoo::get_system_env() -> {'/Path'};
+ $path =~ s/[\s\x00]+$//;
+ log("New system path: $path\n");
+ $path = TeXLive::TLWinGoo::get_user_env() -> {'/Path'};
+ $path =~ s/[\s\x00]+$//;
+ log("New user path: $path\n");
# setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c') if $vars{'from_dvd'};
broadcast_env();