From 34d34ccb5be6159f89253bb1c8099cc2a95b1300 Mon Sep 17 00:00:00 2001
From: Reinhard Kotucha <reinhard.kotucha@web.de>
Date: Sat, 19 Jan 2008 23:26:31 +0000
Subject: install-menu-text.pl: layout changed.  Prevent Windows users from
 installing binaries for other platforms.

git-svn-id: svn://tug.org/texlive/trunk@6332 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/installer/install-menu-text.pl | 31 +++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 3c3719096d1..8dcc0ebed54 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -452,16 +452,21 @@ sub directories_menu {
 
   menu_head "Current directories setup:";
   print <<"EOF";
-  <1>  TEXDIR:       $vars{'TEXDIR'}
-       support tree: $vars{'TEXDIR'}/texmf
+ <1> TEXDIR:       $vars{'TEXDIR'}
+     support tree: $vars{'TEXDIR'}/texmf
 
-  <2>  TEXMFLOCAL:   $vars{'TEXMFLOCAL'}
-  <3>  TEXMFSYSVAR:  $vars{'TEXMFSYSVAR'}
+ <2> TEXMFLOCAL:   $vars{'TEXMFLOCAL'}
+ <3> TEXMFSYSVAR:  $vars{'TEXMFSYSVAR'}
+
+ <4> TEXMFHOME:    $vars{'TEXMFHOME'}
 
-  <4>  TEXMFHOME:    $vars{'TEXMFHOME'}
-                     (~  will be expanded to \$HOME/\$USERPROFILE)
 EOF
 ;
+  if (win32) {
+    print " Note: ~ will expand to %USERPROFILE%\n";
+  } else {
+    print " Note: ~ will expand to \$HOME (or to %USERPROFILE% on Windows)\n";
+  }
 
   other_options qw (R Q);
   my $answer=prompt 'Enter command';
@@ -770,10 +775,13 @@ sub main_menu {
     'L' => \&language_menu,
     'D' => \&directories_menu,
     'S' => \&scheme_menu,
-    'B' => \&binary_menu,
     'Q' => \&quit
       );
 
+  if (unix) {
+    $command{'B'}=\&binary_menu;
+  }
+
   clear_screen;
   
   print <<"EOF";
@@ -794,9 +802,12 @@ sub main_menu {
    $vars{'n_collections_selected'} collections out of $vars{'n_collections_available'}, disk space required: $vars{'total_size'} MB
 
  <D> directories:
-   TEXDIR      (The main TeX directory)        : $vars{'TEXDIR'}     
-   TEXMFLOCAL  (Directory for local styles etc): $vars{'TEXMFLOCAL'}
-   TEXMFSYSVAR (Directory for local config)    : $vars{'TEXMFSYSVAR'}
+   TEXDIR (The main TeX directory):
+     $vars{'TEXDIR'}
+   TEXMFLOCAL (Directory for local styles etc):
+     $vars{'TEXMFLOCAL'}
+   TEXMFSYSVAR (Directory for local config):
+     $vars{'TEXMFSYSVAR'}
 
  <O> options:
 EOF
-- 
cgit v1.2.3