summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2018-11-21 15:05:48 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2018-11-21 15:05:48 +0000
commit9fba7bb23863549c53f0d5f7351ab02176f2b247 (patch)
tree43c435e3ce386ed6e2eff452619ffaf9b1591c81 /Master
parent30b1e4541f13eb9ff365511e1ab98fd43065ee67 (diff)
WISH env var for specifying Tcl/Tk interpreter
git-svn-id: svn://tug.org/texlive/trunk@49210 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl12
1 files changed, 7 insertions, 5 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 1ec5f629f0f..49f7e56da62 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -83,11 +83,13 @@ if ($^O !~ /^MSWin/i) {
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";
+ }
}
}
}