summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-08-12 19:50:45 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-08-12 19:50:45 +0000
commite158d6a4d0cc6bd7cbc32dd34db4f5ab109cf75d (patch)
treef831409065715e667eb08826cd42299323a36153 /Master/install-tl
parentcf5017ed3969b6e560d09c8372581f6ea82fa6dd (diff)
install-tl, Windows: now logs empty user path correctly
git-svn-id: svn://tug.org/texlive/trunk@10285 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl16
1 files changed, 12 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index cedfcd39e4e..a82bdfb9b60 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -486,15 +486,23 @@ sub do_installation {
$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");
+ if ($path) {
+ $path =~ s/[\s\x00]+$//;
+ log("Old user path: $path\n");
+ } else {
+ log("Old user path: none\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");
+ if ($path) {
+ $path =~ s/[\s\x00]+$//;
+ log("New user path: $path\n");
+ } else {
+ log("New user path: none\n");
+ }
# setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c') if $vars{'from_dvd'};
broadcast_env();