summaryrefslogtreecommitdiff
path: root/Master/install-tl.bat
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2013-05-10 13:01:27 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2013-05-10 13:01:27 +0000
commit1f4714ced4c2161a63f959afbe7e1a9f43086bfc (patch)
tree2290c8a84c1998703a5bb00bb1ca3386810788b0 /Master/install-tl.bat
parent16d94df54aae3b3252477492695bd4fe027d1337 (diff)
w32 support for UNC paths
git-svn-id: svn://tug.org/texlive/trunk@30369 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.bat')
-rwxr-xr-xMaster/install-tl.bat20
1 files changed, 8 insertions, 12 deletions
diff --git a/Master/install-tl.bat b/Master/install-tl.bat
index 6cffb14a535..ccffcefcaab 100755
--- a/Master/install-tl.bat
+++ b/Master/install-tl.bat
@@ -9,14 +9,12 @@ rem First, check if this is DOS based system
rem in DOS '^' is just a normal character
if not ^x==x goto DOS
-rem Abort if we are running from UNC path
-if %~d0==\\ goto UNC
-
rem Localize environment changes
setlocal enableextensions
-rem Do we really need to cd to the batch location? Yes.
-cd /d "%~dp0"
+rem Batch subroutines require a cd to the batchfile directory.
+rem For UNC paths, pushd will create a temporary mapping.
+pushd "%~dp0"
rem Remove any double quotes from PATH (why we care for it at all???)
set "path=%path:"=%"
@@ -48,10 +46,14 @@ set PERL_ROOT=
set PERL_SIGNALS=
set PERL_UNICODE=
+set errlev=0
rem Start installer
path
echo "%~dp0install-tl" %*
perl "%~dp0install-tl" %*
+
+rem The nsis installer will need this:
+if errorlevel 1 set errlev=1
pause
goto :eoff
@@ -69,16 +71,10 @@ rem Add dir to path
set "path=%path%;%~1"
goto :rebuildpath
-:UNC
-echo Cannot run from UNC path.
-echo Map network drive to a drive letter and rerun the installer.
-echo You can use pushd/popd commands for temporary mapping.
-pause
-exit /b 1
-
:DOS
echo DOS and Windows 9x systems are not supported. Sorry.
echo Windows 2000 or newer is required.
pause
:eoff
+if unc == 1 popd