tlmgrgui: less error messages when Tk loading failed, more checks

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

1 files changed, 15 insertions, 5 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index e03f07643b3..684ef3e87bc 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -30,17 +30,25 @@ BEGIN {
 eval { require Tk; };
 if ($@) {
   # that didn't work out, give some usefull error message and stop
-  if ($^O=~/^MSWin(32|64)$/i) {
-    printf STDERR "Cannot load Tk, that should not happen as we ship it!
+  my $tkmissing = 0;
+  if ($@ =~ /^Can\'t locate Tk\.pm/) {
+    $tkmissing = 1;
+  }
+  if ($tkmissing) {
+    if ($^O=~/^MSWin(32|64)$/i) {
+      printf STDERR "Cannot load Tk, that should not happen as we ship it!
 How did you start tlmgrgui??\n(Error message: $@)\n";
-  } else {
-    printf STDERR "
+    } else {
+      printf STDERR "
 Cannot load Tk, thus the GUI cannot be started!
 The Perl/Tk module is not shipped with the TeX Live installation.
 You have to install it to get tlmgr GUI running. See
 http://tug.org/texlive/distro.html for more details.
-(Error message: $@)
+
 ";
+    }
+  } else {
+    printf STDERR "Problem loading Tk: $@\n";
   }
   exit 1;
 }
@@ -50,3 +58,5 @@ require("tlmgrgui-real.pl");
 # should not be reached ...
 #
 exit 0;
+
+# vim:set tabstop=2 expandtab: #