texlive[49210] Master/install-tl: WISH env var for specifying Tcl/Tk

[commits+siepo at tug.org]

Revision: 49210
          http://tug.org/svn/texlive?view=revision&revision=49210
Author:   siepo
Date:     2018-11-21 16:05:48 +0100 (Wed, 21 Nov 2018)
Log Message:
-----------
WISH env var for specifying Tcl/Tk interpreter

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2018-11-21 02:31:39 UTC (rev 49209)
+++ trunk/Master/install-tl	2018-11-21 15:05:48 UTC (rev 49210)
@@ -83,11 +83,13 @@
   if ($want_tcl) {
     unshift (@new_args, "--");
     unshift (@new_args, "$::installerdir/tlpkg/installer/install-tl-gui.tcl");
-    if (!exec('wish', @new_args)) {
-      if (!exec('wish8.6', @new_args)) {
-        if (!exec('wish8.5', @new_args)) {
-          if (!exec('tclkit', @new_args)) {
-            die "wish not found\n";
+    if (!(defined $ENV{'WISH'}) || !exec($ENV{'WISH'}, @new_args)) {
+      if (!exec('wish', @new_args)) {
+        if (!exec('wish8.6', @new_args)) {
+          if (!exec('wish8.5', @new_args)) {
+            if (!exec('tclkit', @new_args)) {
+              die "wish not found\n";
+            }
           }
         }
       }