summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-06-15 11:50:07 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-06-15 11:50:07 +0000
commit20a6d14cb3f807778e089021e55bf09c3ce20be1 (patch)
treea8742551d7d6417275f39b9b8b4c653150922d49
parentebc9134dc051c9e91e253a0c463aa1675a06677b (diff)
From_dvd option: can't avoid setting TEXMFCNF.
Unset additional environment variables in Windows uninstaller. git-svn-id: svn://tug.org/texlive/trunk@8749 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl12
-rw-r--r--Master/texmf/scripts/texlive/uninstall-win32.pl3
2 files changed, 11 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index f7855fa8048..eda10790a0a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -421,7 +421,9 @@ if ($vars{'from_dvd'}) {
# Close log file if present
close($::LOGFILE) if defined($::LOGFILE);
-print "Don't forget to set TEXMFSYSVAR to ".$vars{'TEXMFSYSVAR'}."!!!\n"
+#print "Don't forget to set TEXMFSYSVAR to ".$vars{'TEXMFSYSVAR'}."!!!\n"
+print "Don't forget to set TEXMFCNF to\n ".
+ $vars{'TEXMFSYSVAR'}."/web2c:".$vars{'TEXDIR'}."/texmf/web2c !!!\n"
if ($vars{'from_dvd'} and !win32());
exit(0);
@@ -447,7 +449,9 @@ sub do_installation {
}
if (win32()) {
add_texbindir_to_path($vars{'TEXDIR'}.'/bin/win32');
- setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
+ # setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
+ setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c;'.
+ $vars{'TEXDIR'}.'/texmf/web2c') if $vars{'from_dvd'};
broadcast_env();
create_uninstaller($vars{'TEXDIR'}, $vars{'TEXDIRW'},
$vars{'TEXMFSYSVAR'}, $vars{'TEXMFSYSCONFIG'});
@@ -1085,11 +1089,11 @@ sub do_texmf_cnf {
foreach (@newtmf) { print TMF; }
close(TMF);
} else { # $vars{'from_dvd'}
- open(TMF,">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
+ open(TMF,">>$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
or die(
"Cannot open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n");
print TMF "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
- # skip TEXMFSYSVAR since it has to be defined by an env var anyway
+ print TMF "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
print TMF "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
print TMF "TEXMFHOME = $vars{'TEXMFHOME'}\n";
print TMF "OSFONTDIR = \$SystemRoot/fonts//\n" if win32();
diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl
index ed7e29c8d58..7cd1bf5c979 100644
--- a/Master/texmf/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf/scripts/texlive/uninstall-win32.pl
@@ -41,6 +41,9 @@ $cancel->pack(-side => 'left' , -padx => "3m");
sub doit {
remove_texbindirs_from_path();
unsetenv_reg("TEXBINDIR");
+ # from_dvd case:
+ unsetenv_reg("TEXMFSYSVAR");
+ unsetenv_reg("TEXMFCNF");
unregister_uninstaller();
exit if is_vista();
broadcast_env();