summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-03-19 12:35:02 +0000
committerNorbert Preining <preining@logic.at>2009-03-19 12:35:02 +0000
commita39f0a8f231460fbc6a73c71729824de5c7be1b0 (patch)
tree88bacccc0936b570523d66a2a37830629daca012
parent89602ec0b59d66c079aedc87458c14e7267638f5 (diff)
default w32 file_assocs to off (setting in 00texlive.installation), and
fix wording git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@12426 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl2
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl
index c0e00e08917..6bc12779478 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1090,7 +1090,7 @@ sub load_tlpdb {
$vars{'option_path'} = 1 if win32();
$vars{'option_w32_multi_user'} = $tlpdb->option_w32_multi_user;
$vars{'option_file_assocs'} = $tlpdb->option_file_assocs;
- $vars{'option_file_assocs'} = 1 if win32();
+ # $vars{'option_file_assocs'} = 1 if win32();
$vars{'option_post_code'} = $tlpdb->option_post_code;
$vars{'sys_bin'} = $tlpdb->option_sys_bin;
$vars{'sys_man'} = $tlpdb->option_sys_man;
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 920774233bf..67283e41697 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -742,7 +742,7 @@ EOF
}
if (win32()) {
print " <M> install menu items, shortcuts, etc: $b_deskint\n";
- print " <N> Update file associations: $b_fileassocs\n";
+ print " <N> update file associations: $b_fileassocs\n";
if (admin()) {
# if we are admin we allow normal user installation, too
print " <U> installation for all users: $b_admin\n";