diff options
| author | Siep Kroonenberg <siepo@cybercomm.nl> | 2008-07-28 19:11:05 +0000 |
|---|---|---|
| committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2008-07-28 19:11:05 +0000 |
| commit | 5c3879fd68d93ad4dfee849f4d4a5c4964397389 (patch) | |
| tree | 2218f0d878fbf4dde415fafef7ea9d6d0cab929d /Master/install-tl | |
| parent | 8ab7544c291f58bfbb0a66a69668985cf463124f (diff) | |
install-tl: explicit xetex postinstall only for opt_portable;
no TEXMFCNF warning if from_dvd
git-svn-id: svn://tug.org/texlive/trunk@9846 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl index 3108e3fcd98..ff89060380e 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -897,7 +897,7 @@ sub do_postinst_stuff { my @TMFVARS1=qw(TEXMFMAIN TEXMFDIST TEXMFLOCAL TEXMFSYSVAR TEXMFSYSCONFIG TEXMFHOME TEXMFVAR TEXMFCONFIG); - if (defined($ENV{'TEXMFCNF'})) { + if (defined($ENV{'TEXMFCNF'}) and !$vars{'from_dvd'}) { print "WARNING: environment variable TEXMFCNF is set. You should know what you are doing. We will remove that for the post install actions, but all further @@ -956,7 +956,8 @@ operations might be disturbed.\n\n"; } } # $opt_portable: no %install but we still want xetex postinstall - &{$PostInstall{'xetex'}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL); + &{$PostInstall{'xetex'}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL) + if $opt_portable; update_assocs() if win32(); # Step 4: run the programs |