summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl3
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl16
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc2
3 files changed, 13 insertions, 8 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 7f70d6f9a7f..3d5721fade7 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1133,7 +1133,6 @@ 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_post_code'} = $tlpdb->option("post_code");
$vars{'option_sys_bin'} = $tlpdb->option("sys_bin");
$vars{'option_sys_man'} = $tlpdb->option("sys_man");
@@ -1337,7 +1336,7 @@ sub save_options_into_tlpdb {
$localtlpdb->option ("location", $location);
$localtlpdb->option ("create_formats", $vars{'option_fmt'} ? "1" : "0");
$localtlpdb->option ("desktop_integration", $vars{'option_desktop_integration'} ? "1" : "0");
- $localtlpdb->option ("file_assocs", $vars{'option_file_assocs'} ? "1" : "0");
+ $localtlpdb->option ("file_assocs", $vars{'option_file_assocs'});
$localtlpdb->option ("post_code", $vars{'option_post_code'} ? "1" : "0");
$localtlpdb->option ("sys_bin", $vars{'option_sys_bin'});
$localtlpdb->option ("sys_info", $vars{'option_sys_info'});
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 5fcaa2ecda7..7dcc2644dc8 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -694,7 +694,6 @@ sub options_menu {
my $b_fmt=button($vars{'option_fmt'});
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
- my $b_fileassocs=button($vars{'option_file_assocs'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'addon_editor'});
@@ -743,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: [$vars{'option_file_assocs'}]\n";
if (admin()) {
# if we are admin we allow normal user installation, too
print " <U> make installation available to all users: $b_admin\n";
@@ -798,7 +797,15 @@ EOF
return $command{'self'};
} elsif ("\u$answer" eq 'N') {
- toggle 'option_file_assocs';
+ print "New value for file_assocs:\n";
+ print " 0 -- don't tweak the file associations\n";
+ print " 1 -- only add new file associations, don't overwrite old ones\n";
+ print " 2 -- always create file associations to TeX Live programs\n";
+ print "New value for file_assocs [$vars{'option_file_assocs'}]: ";
+ chomp (my $a = <STDIN>);
+ if ($a eq "0" || $a eq "1" || $a eq "2") {
+ $vars{'option_file_assocs'} = $a;
+ }
return $command{'self'};
} elsif ("\u$answer" eq 'U') {
@@ -864,7 +871,6 @@ sub main_menu {
my $b_fmt=button($vars{'option_fmt'});
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
- my $b_fileassocs=button($vars{'option_file_assocs'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'addon_editor'});
@@ -976,7 +982,7 @@ EOF
if (win32()) {
print " $b_path adjust search path\n";
print " $b_deskint add menu items, shortcuts, etc.\n";
- print " $b_fileassocs update file associations\n";
+ print " [$vars{'option_file_assocs'}] update file associations\n";
if (admin()) {
print " $b_admin make installation available to all users\n";
}
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 64bc81c4411..70506160490 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -33,7 +33,7 @@ longdesc are never split into .src and .doc sub-packages in the tlpdb.
depend opt_location:__MASTER__
depend opt_paper:a4
depend opt_create_formats:1
-depend opt_desktop_integration:0
+depend opt_desktop_integration:1
depend opt_file_assocs:1
depend opt_post_code:1
depend opt_w32_multi_user:1