make <V> toggle between HD/DVD setup

git-svn-id: svn://tug.org/texlive/trunk@9377 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 20 insertions, 24 deletions

diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 2e6583fe7bb..53b1f368ef7 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -752,15 +752,14 @@ sub do_install {
   $RETURN = $MENU_INSTALL;
 }
 
-sub to_hd {
-  $vars{'from_dvd'} = 0;
-  $vars{'TEXDIR'} = $vars{'TEXDIRW'};
-  main_menu;
-}
-
-sub from_dvd {
-  $vars{'from_dvd'} = 1;
-  $vars{'TEXDIR'} = abs_path($::installerdir);
+sub dvd_hd_toggle {
+  if ($vars{'from_dvd'}) {  # set up for hd install:
+    $vars{'from_dvd'} = 0;
+    $vars{'TEXDIR'} = $vars{'TEXDIRW'};
+  } else {                  # set up for dvd install:
+    $vars{'from_dvd'} = 1;
+    $vars{'TEXDIR'} = abs_path($::installerdir);
+  }
   main_menu;
 }
 
@@ -791,26 +790,23 @@ sub main_menu {
   }
   calc_depends;
 
-  my %command=(
+  my %command = (
     'self' => \&main_menu,
-    'O' => \&options_menu,
-    'I' => \&do_install,
-    'H' => \&help_menu,
     'D' => \&directories_menu,
-    'T' => \&to_hd,
-    'V' => \&from_dvd,
-    'Q' => \&quit
-      );
+    'H' => \&help_menu,
+    'I' => \&do_install,
+    'O' => \&options_menu,
+    'Q' => \&quit,
+    'V' => \&dvd_hd_toggle,
+  );
   if (!$vars{'from_dvd'}) {
-    $command{'S'}=\&scheme_menu;
-    $command{'C'}=\&collection_menu;
-    $command{'L'}=\&language_menu;
-    $command{'B'}=\&binary_menu if unix;
+    $command{'B'} = \&binary_menu if unix;
+    $command{'C'} = \&collection_menu;
+    $command{'L'} = \&language_menu;
+    $command{'S'} = \&scheme_menu;
   }
 
-
   clear_screen;
-
   print <<"EOF";
 ======================> TeX Live installation procedure <=====================
 
@@ -887,7 +883,7 @@ EOF
   }
 
   if ($vars{'from_dvd'}) {
-    print "\n <T> set up for installing to hard disk\n";
+    print "\n <V> set up for installing to hard disk\n";
   } else {
     print "\n <V> set up for running from DVD\n";
   }