From dc2fea8b1c807868c2be43828d02062a02bef2f7 Mon Sep 17 00:00:00 2001
From: Siep Kroonenberg <siepo@cybercomm.nl>
Date: Sat, 1 Nov 2008 10:52:32 +0000
Subject: Prepend <root>/bin/win32 to path; also use setlocal

git-svn-id: svn://tug.org/texlive/trunk@11149 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/install-tl.bat | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'Master')

diff --git a/Master/install-tl.bat b/Master/install-tl.bat
index a0d1837ada2..d3ade37b586 100755
--- a/Master/install-tl.bat
+++ b/Master/install-tl.bat
@@ -1,7 +1,7 @@
 @echo off
+setlocal
 
 rem TeX Live Root; ends with backslash
-rem This should also work with UNC names
 set tlroot=%~dp0
 set tldrive=%~d0
 
@@ -9,25 +9,17 @@ set tldrive=%~d0
 cd %tlroot%
 
 rem we need wget in the path, so add tlpkg\bin to the path
-set pathsave=%path%
 path %tlroot%tlpkg\installer;%path%
 
-rem use provided Perl
-
-set PERL5SAVE=%PERL5LIB%
+rem We shouldn't have to add TL to the searchpath here, but we do
+path %tlroot%bin\win32;%path%
 
+rem use provided Perl
 set PERL5LIB=%tlroot%tlpkg\installer\perllib
 "%tlroot%tlpkg\installer\perl" "%~dpn0" %*
 pause Done
 
-rem cleanup in case of start from command-line
-
-set PERL5LIB=%PERL5SAVE%
-set PERL5SAVE=
-path %pathsave%
-set pathsave=
-set tldrive=
-set tlroot=
+rem endlocal is implicit
 
 rem About install-tl.bat.manifest:
 rem Vista assumes that a file with install in the name is
-- 
cgit v1.2.3