summaryrefslogtreecommitdiff
path: root/Master/install-tl.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-01-26 09:45:34 +0000
committerNorbert Preining <preining@logic.at>2008-01-26 09:45:34 +0000
commit33190ad083f274e1c115f9accea810903efed71a (patch)
tree158e97fd7090e90b5ae33c912b726e1d3a0f41cf /Master/install-tl.pl
parent7dcc211e4ec379d0a4802e531e9d680a7af5e2c6 (diff)
install into $ProgramFiles if possible, even if non-admin user
git-svn-id: svn://tug.org/texlive/trunk@6421 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-xMaster/install-tl.pl8
1 files changed, 3 insertions, 5 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 6eceb7f4863..23d3f3f77e8 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -414,11 +414,9 @@ sub set_texlive_default_dirs {
if (win32) {
#require("TeXLive/win-admin.pl");
$vars{'win-admin'} = admin();
- if ($vars{'win-admin'}) {
- $tex_prefix||=getenv('ProgramFiles') . '/texlive';
- } else {
- $tex_prefix||=getenv('USERPROFILE') . '/texlive';
- }
+ my $prog = getenv('ProgramFiles');
+ $tex_prefix ||= $prog . '/texlive' if TeXLive::TLWinGoo::dir_writable($prog);
+ $tex_prefix||=getenv('USERPROFILE') . '/texlive';
} else {
$tex_prefix||='/usr/local/texlive';
}