summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/bin/win32/tlmgr.bat11
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl6
2 files changed, 7 insertions, 10 deletions
diff --git a/Master/bin/win32/tlmgr.bat b/Master/bin/win32/tlmgr.bat
index 867cf3a68ac..3b94283c375 100755
--- a/Master/bin/win32/tlmgr.bat
+++ b/Master/bin/win32/tlmgr.bat
@@ -7,15 +7,8 @@ rem
setlocal
rem TL installation root
for %%P in ("%~dp0..\..") do set "tlroot=%%~fP"
-rem This shouldn't be necessary but without it 'tlmgr gui' complains
-rem Comment from Tomek:
-rem It is not about putting tlpkg\installer on the path, this is
-rem irrelevant. It's about making sure that cmd.exe is not found on the
-rem first element of the path.
-rem I looks like perl discards or somehow mishandles the very first of the
-rem path when it searches for cmd.exe. In fact, even this is enough to fix it:
-path ;%path%
-rem Alternatively we can activate the original way by adding the installer dir
+
+rem not needed anymore
rem path %TLdir%\tlpkg\installer;%path%
rem Start tlmgr
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 52d6ed44fda..272d091de9f 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -35,7 +35,11 @@ BEGIN {
$^W = 1;
# make subprograms (including kpsewhich) have the right path:
($mydir = $0) =~ s,/[^/]*$,,;
- $ENV{"PATH"} = "$mydir:$ENV{PATH}";
+ if ($^O=~/^MSWin(32|64)$/i) {
+ $ENV{"PATH"} = "$mydir;$ENV{PATH}";
+ } else {
+ $ENV{"PATH"} = "$mydir:$ENV{PATH}";
+ }
#
chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
#