diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl | 3 | ||||
-rwxr-xr-x | Master/install-tl.bat | 20 |
2 files changed, 9 insertions, 14 deletions
diff --git a/Master/install-tl b/Master/install-tl index fe2804fe3b0..d4d466d2246 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -853,8 +853,7 @@ operations might be disturbed.\n\n"; } if (win32() and !$vars{'portable'} and !$vars{'in_place'}) { - create_uninstaller($vars{'TEXDIR'}, - $vars{'TEXMFSYSVAR'}, $vars{'TEXMFSYSCONFIG'}); + create_uninstaller($vars{'TEXDIR'}); # TODO: custom uninstaller for in_place # (re-)initialize batchfile for uninstalling shortcuts } 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
|