Fixes for handling TEXDIR

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

3 files changed, 29 insertions, 9 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 7f17d1d6d1b..8b57a620dd5 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -323,7 +323,7 @@ sub run_menu_perltk {
 
   if ($::opt_all_options || win32()) {
     $row++;
-    $fr->Label(-text => __('Add shortcuts to menu and desktop'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+    $fr->Label(-text => __('Add menu shortcuts'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
     $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
     $deskintbutton = $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); });
     $deskintbutton->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
@@ -886,7 +886,7 @@ sub menu_set_pathes_text {
   if (TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) {
     menu_set_text($texdirtext, native_slashify($vars{'TEXDIR'}), -foreground => "black");
   } else {
-    menu_set_text($texdirtext, __("(default not writable - please change!)"), -foreground => "red");
+    menu_set_text($texdirtext, __("(default not allowed or not writable - please change!)"), -foreground => "red");
   }
   menu_set_text($texmflocaltext, native_slashify($vars{'TEXMFLOCAL'}));
   if ((-w $vars{'TEXMFSYSVAR'}) || (-w dirname($vars{'TEXMFSYSVAR'}))) {
@@ -982,7 +982,15 @@ sub callback_edit_directories {
       $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var";
       $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config";
     }
-    $vars{'TEXDIRW'}=$vars{'TEXDIR'}
+    if ($vars{'TEXDIR'} =~ /:$/) {
+      # drive letter
+      $vars{'TEXDIR'} = $vars{'TEXDIR'}."/";
+      # note: main::do_installation will remove this final slash
+    } elsif ($vars{'TEXDIR'} =~ /\/$/ and $vars{'TEXDIR'} !~ /:\/$/) {
+      # remove final slash
+      $vars{'TEXDIR'} =~ s!/$!!;
+    }
+    #$vars{'TEXDIRW'}=$vars{'TEXDIR'}
   }
   menu_update_texts();
 }
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 57325029979..b349c52ce59 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -458,7 +458,8 @@ sub directories_menu
 
   menu_head "Directories setup:";
   if (!TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) {
-    print "!! The default location as given below can't be written to.
+    print "!! The default location as given below is forbidden or
+!! can't be written to.
 !! Either change the destination directory using <1> or create it
 !! outside this script.
 ";
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 7403997ea0c..82f106ad28d 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -269,7 +269,7 @@ sub check_show_warning {
     $warning->configure(-text => "");
     $nxt->configure(-state => "normal");
   } else {
-    $warning->configure(-text => __('(default not writable - please change!)'));
+    $warning->configure(-text => __('(default not allowed or not writable - please change!)'));
     $nxt->configure(-state => "disabled");
   }
 }
@@ -298,6 +298,7 @@ sub change_path {
 sub callback_change_texdir {
   my ($val) = @_;
   my $home = getenv('HOME');
+  my $texdirnoslash;
   if (win32()) {
     $home = getenv('USERPROFILE');
     $home =~ s!\\!/!g;
@@ -315,11 +316,21 @@ sub callback_change_texdir {
     $vars{'TEXMFSYSVAR'}="$1/$texlive_release/texmf-var";
     $vars{'TEXMFSYSCONFIG'}="$1/$texlive_release/texmf-config";
   } elsif ($vars{'TEXDIR'}=~/^(.*)$/) {
-    $vars{'TEXMFLOCAL'}="$1/texmf-local";
-    $vars{'TEXMFSYSVAR'}="$1/texmf-var";
-    $vars{'TEXMFSYSCONFIG'}="$1/texmf-config";
+    $texdirnoslash = $1;
+    $texdirnoslash =~ s!/$!!;
+    $vars{'TEXMFLOCAL'}="$texdirnoslash/texmf-local";
+    $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var";
+    $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config";
+  }
+  if ($vars{'TEXDIR'} =~ /:$/) {
+    # drive letter: add final slash
+    $vars{'TEXDIR'} = $vars{'TEXDIR'}."/";
+    # note: main::do_installation will remove this final slash
+  } elsif ($vars{'TEXDIR'} =~ /\/$/ and $vars{'TEXDIR'} !~ /:\/$/) {
+    # remove final slash
+    $vars{'TEXDIR'} =~ s![\\/]$!!;
   }
-  $vars{'TEXDIRW'}=$vars{'TEXDIR'};
+  #$vars{'TEXDIRW'}=$vars{'TEXDIR'};
   $dest = $vars{'TEXDIR'};
   $dest_display = native_slashify($dest); # useful as -textvar value in Labels
   check_show_warning();