texlive[43834] Master/install-tl: simplify code, drop last appearance

[commits+preining at tug.org]

Revision: 43834
          http://tug.org/svn/texlive?view=revision&revision=43834
Author:   preining
Date:     2017-04-16 04:14:32 +0200 (Sun, 16 Apr 2017)
Log Message:
-----------
simplify code, drop last appearance of menu_integration

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2017-04-16 02:14:25 UTC (rev 43833)
+++ trunk/Master/install-tl	2017-04-16 02:14:32 UTC (rev 43834)
@@ -575,7 +575,10 @@
 }
 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 @@
   }
   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 @@
   }
 } # 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) {