summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/bin/win32/asy.bat6
-rwxr-xr-xMaster/bin/win32/dviout.bat17
-rwxr-xr-xMaster/bin/win32/psv.bat5
3 files changed, 14 insertions, 14 deletions
diff --git a/Master/bin/win32/asy.bat b/Master/bin/win32/asy.bat
index b61fa174b6c..8abd057a099 100755
--- a/Master/bin/win32/asy.bat
+++ b/Master/bin/win32/asy.bat
@@ -5,9 +5,9 @@ rem Originally written by Tomasz M. Trzeciak
rem Public Domain
setlocal enableextensions
-rem Get TL installation root (it should be two levels up)
-rem Use short path, because of problems with spaces and calling batch files
-for %%I in ("%~dp0\..\..") do (set TLROOT=%%~fI)
+rem Get TL installation root (w/o trailing backslash)
+set TLROOT=%~dp0:
+set TLROOT=%TLROOT:\bin\win32\:=%
rem Add gs and bin dir to PATH
path %TLROOT%\bin\win32;%TLROOT%\tlpkg\tlgs\bin;%PATH%
rem GS environment
diff --git a/Master/bin/win32/dviout.bat b/Master/bin/win32/dviout.bat
index d2970477995..5cf473f1fbf 100755
--- a/Master/bin/win32/dviout.bat
+++ b/Master/bin/win32/dviout.bat
@@ -8,18 +8,17 @@ rem Make environment changes local
rem Disable delayed expansion (makes processing bang ! char easier)
setlocal enableextensions disabledelayedexpansion
-rem Add bin dir to path; avoid trailing backslash
-for %%I in ("%~f0\..") do path %%~fI;%path%
+rem Get TL installation root (w/o trailing backslash)
+set tlroot=%~dp0:
+set tlroot=%tlroot:\bin\win32\:=%
+if not exist %tlroot%\bin\win32\kpsewhich.exe goto :no_tl
-rem Ask kpsewhich for TLROOT and TEXMFVAR
-set tlroot=
-for /f "tokens=1,2 delims=;" %%I in (
- 'kpsewhich --expand-var "$SELFAUTOPARENT/.;$TEXMFVAR/."'
+rem Ask kpsewhich for TEXMFVAR
+for /f "delims=" %%I in (
+ 'kpsewhich --expand-var "$TEXMFVAR/fonts"'
) do (
- set tlroot=%%~sfI
- set fontsdir=%%~fJ\fonts
+ set fontsdir=%%~fJ
)
-if not defined tlroot goto :no_tl
if not exist "%fontsdir%\" md "%fontsdir%"
if not exist "%fontsdir%\" goto :no_fontsdir
diff --git a/Master/bin/win32/psv.bat b/Master/bin/win32/psv.bat
index 9e407d1e022..e58f142ddb9 100755
--- a/Master/bin/win32/psv.bat
+++ b/Master/bin/win32/psv.bat
@@ -3,8 +3,9 @@ rem Launcher script for PSV
rem Make environment changes local
setlocal enableextensions
-rem Get TL root (should be two levels up)
-for %%I in ("%~dp0..\..") do (set tlroot=%%~fI)
+rem Get TL installation root (w/o trailing backslash)
+set tlroot=%~dp0:
+set tlroot=%tlroot:\bin\win32\:=%
rem Use provided GS
set GS_LIB=%tlroot%\tlpkg\tlgs\lib;%tlroot%\tlpkg\tlgs\fonts
set GS_DLL=%tlroot%\tlpkg\tlgs\bin\gsdll32.dll