install-menu-perltk.pl: revised explanation of ~

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

3 files changed, 17 insertions, 8 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 9e249ce59f8..2f1d7f12d95 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -137,7 +137,7 @@ my %text = ( title      => 'TeX Live 2008 Installation',
              status     => 'Status output',
              changevar  => 'Change variable value',
              enterpath  => 'Enter path for',
-             hinthome   => '(use ~ for HOME/USERPROFILE)',
+             hinthome   => '(use ~ for %%%)',
              selectscheme => 'Select a scheme',
              selectstdcol => 'Select the collections to be installed',
              selectall  => 'Select All',
@@ -250,7 +250,7 @@ sub run_menu {
   if (!win32()) {
     $row++;
     $fr->Label(-text => $labels{'binsys'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-    $bintextbutton = $fr->Label(-anchor => 'w'); 
+    $bintextbutton = $fr->Label(-anchor => 'w');
     $bintextbutton->grid(-row => $row, -column => 2, -padx => "2m");
     $fr->Button(-text => $text{'change'}, -command => sub { menu_select_binsystems(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
@@ -259,7 +259,7 @@ sub run_menu {
 
   # scheme line
   $fr->Label(-text => $labels{'scheme'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-  $schemebutton = $fr->Label(-anchor => 'w'); 
+  $schemebutton = $fr->Label(-anchor => 'w');
   $schemebutton->grid(-row => $row, -column => 2, -padx => "2m");
   $fr->Button(-text => $text{'change'}, -command => sub { menu_select_scheme(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
 
@@ -353,7 +353,7 @@ sub run_menu {
 
     $row++;
     $fr->Label(-text => $labels{'symlink'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-    $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m"); 
+    $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m");
     $fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
@@ -412,7 +412,15 @@ sub menu_edit_vars_value {
   $sw->transient($mainwindow);
   $sw->grab();
   my $val = $vars{$key};
-  $sw->Label(-text => $text{'enterpath'} . " $key: " . $text{'hinthome'})->pack(-padx => "2m", -pady => "2m");
+  my $hint_var;
+  if ($key ne 'TEXMFHOME') {
+    $hint_var = win32() ? $ENV{'USERPROFILE'} : $ENV{'HOME'};
+  } else {
+    $hint_var = win32() ? '%USERPROFILE%' : '$HOME';
+  }
+  my $hint_text =  $text{'hinthome'};
+  $hint_text =~ s/%%%/$hint_var/;
+  $sw->Label(-text => $text{'enterpath'} . " $key: " . $hint_text)->pack(-padx => "2m", -pady => "2m");
   my $entry = $sw->Entry(-textvariable => $val, -width => 60);
   $entry->pack(-padx => "2m", -pady => "2m");
   my $f = $sw->Frame;
@@ -616,7 +624,7 @@ sub menu_select_symlink {
   $sw->grab();
   $sw->Checkbutton(-variable => \$osym,
                    -text => $text{'createsym'},
-		   -command => sub { set_unset_buttons(); } )->grid(-column => 1, 
+		   -command => sub { set_unset_buttons(); } )->grid(-column => 1,
                                                         -row => 1,
                                                         -columnspan => 2,
                                                         -padx => "2m");
diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample
index cb885d13eab..9e6411072ce 100644
--- a/Master/tlpkg/installer/lang/perltk-en.sample
+++ b/Master/tlpkg/installer/lang/perltk-en.sample
@@ -21,7 +21,8 @@ text.cancel:       Cancel
 text.status:       Status output
 text.changevar:    Change variable value
 text.enterpath:    Enter path for
-text.hinthome:     (use ~ for HOME/USERPROFILE)
+# below, `%%%' will be replaced by home directory.
+text.hinthome:     (use ~ for %%%)
 text.selectscheme: Select a Scheme
 text.selectstdcol: Select the collections to be installed
 text.selectall:    Select All
diff --git a/Master/tlpkg/installer/lang/perltk-nl b/Master/tlpkg/installer/lang/perltk-nl
index 245245e8dad..03c0284fae3 100644
--- a/Master/tlpkg/installer/lang/perltk-nl
+++ b/Master/tlpkg/installer/lang/perltk-nl
@@ -18,7 +18,7 @@ text.cancel:       Afbreken
 text.status:       Uitvoer
 text.changevar:    Nieuwe waarde
 text.enterpath:    Pad voor
-text.hinthome:     (gebruik ~ voor HOME/USERPROFILE)
+text.hinthome:     (gebruik ~ voor %%%)
 text.selectscheme: Kies schema
 text.selectstdcol: Kies standaard-collecties
 text.selectall:    Kies alles