summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl14
1 files changed, 4 insertions, 10 deletions
diff --git a/Master/install-tl b/Master/install-tl
index d7c96322204..665811c63b6 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -575,7 +575,10 @@ foreach my $key (sort keys %vars) {
}
log("Settings:\n" . $varsdump);
-sanitise_options();
+# portable option overrides any system integration options
+$vars{'instopt_adjustpath'} = 0 if $vars{'instopt_portable'};
+$vars{'tlpdbopt_file_assocs'} = 0 if $vars{'instopt_portable'};
+$vars{'tlpdbopt_desktop_integration'} = 0 if $vars{'instopt_portable'};
install_warnlines_hook(); # collect warnings in @::WARNLINES
info("Installing to: $vars{TEXDIR}\n");
@@ -780,7 +783,6 @@ sub do_installation {
}
if ($vars{'instopt_portable'}) {
$vars{'tlpdbopt_desktop_integration'} = 0;
- $vars{'tlpdbopt_menu_integration'} = 0;
$vars{'tlpdbopt_file_assocs'} = 0;
$vars{'instopt_adjustpath'} = 0;
$vars{'tlpdbopt_w32_multi_user'} = 0;
@@ -1904,14 +1906,6 @@ sub read_profile {
}
} # read_profile
-# helper subroutine to do sanity check of options before installation
-sub sanitise_options {
- # portable option overrides any system integration options
- $vars{'instopt_adjustpath'} = 0 if $vars{'instopt_portable'};
- $vars{'tlpdbopt_file_assocs'} = 0 if $vars{'instopt_portable'};
- $vars{'tlpdbopt_desktop_integration'} = 0 if $vars{'instopt_portable'};
-} # sanitise_options
-
sub do_install_packages {
my @what;
foreach my $package (sort keys %install) {