texlive[49206] Master/tlpkg/TeXLive/TLUtils.pm: support

[commits+preining at tug.org]

Revision: 49206
          http://tug.org/svn/texlive?view=revision&revision=49206
Author:   preining
Date:     2018-11-21 01:29:16 +0100 (Wed, 21 Nov 2018)
Log Message:
-----------
support TEXLIVE_PREFER_OWN env var for setup_programs

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLUtils.pm

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-11-20 22:02:39 UTC (rev 49205)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-11-21 00:29:16 UTC (rev 49206)
@@ -2348,6 +2348,18 @@
   my ($bindir, $platform, $tlfirst) = @_;
   my $ok = 1;
 
+  # tlfirst is (currently) not passed in by either the installer or
+  # tlmgr, so it will be always false.
+  # If it is not defined, we check for the env variable
+  #   TEXLIVE_PREFER_OWN
+  #
+  if (!defined($tlfirst)) {
+    if ($ENV{'TEXLIVE_PREFER_OWN'}) {
+      debug("setup_programs: TEXLIVE_PREFER_OWN is set!");
+      $tlfirst = 1;
+    }
+  }
+
   debug("setup_programs: preferring " . ($tlfirst ? "TL" : "system") . " versions\n");
 
   my $isWin = ($^O =~ /^MSWin/i);