summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-05 01:18:33 +0000
committerNorbert Preining <preining@logic.at>2009-07-05 01:18:33 +0000
commitcdfc8de827514ed537999319e01fb0a17014d027 (patch)
tree0cc923ef97a6d06e5c0b9e11cce7062bc8c1b25f
parentb486d1d080fcd97a0ec27b31a34b3db7bd243c8c (diff)
do not ask for file_assocs in the wizard, it has a fine default.
git-svn-id: svn://tug.org/texlive/trunk@14108 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl6
-rw-r--r--Master/tlpkg/installer/installer-options.txt9
2 files changed, 11 insertions, 4 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index c1b7c632131..aaab3891c07 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -333,8 +333,10 @@ sub ask_options {
$ytmp += 50;
$bdesk->place(-x => 0, -y => $ytmp);
- $ytmp += 50;
- $bassocs->place(-x => 0, -y => $ytmp);
+ # now that we only create assocs if there aren't any other by default
+ # we don't ask that anymore
+ #$ytmp += 50;
+ #$bassocs->place(-x => 0, -y => $ytmp);
# disabled after discussion, PATH will be set up automatically
# when using the wizard
diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt
index cd8c838bc16..abf279dff03 100644
--- a/Master/tlpkg/installer/installer-options.txt
+++ b/Master/tlpkg/installer/installer-options.txt
@@ -23,9 +23,14 @@ option_fmt 1 x x
install-tl: sub do_postinst_stuff
tlmgr: sub handle_execute_actions
-option_file_assocs 0 w32 w32 w32
+option_file_assocs 0 w32 w32
option("file_assocs")
- file associations postaction
+ file associations and file type
+ file type is always done
+ file associations:
+ 0: do nothing
+ 1: do only new/unchanged
+ 2: always do
install-tl: sub do_tlpdb_postactions
TLMedia: remove_package, install_package