summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/tlpkg/bin/tl-update-install-pkg6
-rw-r--r--Master/tlpkg/libexec/install-tl.nsi17
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc1
4 files changed, 12 insertions, 13 deletions
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index 36ddfa02950..9ba69041d2d 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -206,7 +206,7 @@ sub make_zip {
chomp (my $prevdir = `pwd`);
&xchdir ($tmpdir);
if ($type eq 'zip') {
- &xsystem ('zip', '-rq', 'install-tl.zip', $install_tl_name);
+ &xsystem ('zip', '-rq', 'install-tl-windows.zip', $install_tl_name);
} elsif ($type eq 'nsis') {
# write include file for dated install directory.
@@ -231,7 +231,7 @@ sub make_zip {
sub install_files {
$outputdir = abs_path ($outputdir);
info ("$0: Installing to $outputdir\n");
- for my $f ("install-tl-unx.tar.gz", "install-tl.zip", "install-tl.exe") {
+ for my $f ("install-tl-unx.tar.gz", "install-tl-windows.zip", "install-tl-windows.exe") {
copy ("$tmpdir/$f", $outputdir);
system ("cd $outputdir && sha256sum $f >$f.sha256");
system ('ls', '-l', "$outputdir/$f");
@@ -250,7 +250,7 @@ sub install_files {
# unpack in a temp directory.
my $junkdir = "junkdir";
mkdir ($junkdir);
- xsystem ("cd $junkdir && unzip -q $outputdir/install-tl.zip");
+ xsystem ("cd $junkdir && unzip -q $outputdir/install-tl-windows.zip");
# move what we want and erase the rest.
-d "tlpkg"
diff --git a/Master/tlpkg/libexec/install-tl.nsi b/Master/tlpkg/libexec/install-tl.nsi
index 301a629f86a..1a6a8317801 100644
--- a/Master/tlpkg/libexec/install-tl.nsi
+++ b/Master/tlpkg/libexec/install-tl.nsi
@@ -3,7 +3,8 @@
; This file is licensed under the GNU General Public License version 2
; or any later version.
;
-; This nsi script is used by tl-update-install-pkg to make install-tl.exe.
+; This nsi script is used by tl-update-install-pkg to make
+; install-tl-windows.exe.
!include nsDialogs.nsh
!include WinVer.nsh
@@ -25,7 +26,7 @@
!include tlsubdir.nsh ; generated by tl-update-install-pkg
Name "TeX Live Installer ${YYYYMMDD}"
-OutFile install-tl.exe
+OutFile install-tl-windows.exe
Caption "TeX Live installer"
SubCaption 2 ": Unpack directory"
@@ -58,7 +59,7 @@ Var Completed_text
CompletedText $Completed_text
Var InstOrUnpack
-; parameters to nsis installer are passed along to install-tl.bat
+; parameters to nsis installer are passed along to install-tl-windows.bat
Var PARMS
Page custom tlOptionsPage tlOptionsPageLeave
@@ -160,7 +161,7 @@ Function tlOptionsPageLeave
${If} $Radio_Value == "unpack"
StrCpy $INSTDIR "$DESKTOP"
StrCpy $Completed_text \
- "Done unpacking; next run install-tl.bat or install-tl-advanced.bat."
+ "Done unpacking; next run install-tl-windows.bat or install-tl-advanced.bat."
StrCpy $InstOrUnpack "Unpack"
;StrCpy $NextOrUnpack "Next"
${Else}
@@ -213,7 +214,7 @@ Function ConfirmPage
${If} $Radio_Value == "unpack"
${NSD_CreateLabel} 0 30% 100% 80u \
- "The main installer will be unpacked into $INSTDIR\${INST_TL_NAME}.$\r$\n$\r$\nStart the main installer with install-tl.bat or install-tl-advanced.bat."
+ "The main installer will be unpacked into $INSTDIR\${INST_TL_NAME}.$\r$\n$\r$\nStart the main installer with install-tl-windows.bat or install-tl-advanced.bat."
${ElseIf} $Radio_Value == "advanced"
${NSD_CreateLabel} 0 30% 100% 80u \
"Click 'Install' to start the main installer,$\r$\nwhich lets you select components and an installation directory.$\r$\n$\r$\nUnpacking the main installer may take a few moments..."
@@ -255,9 +256,9 @@ Section
File /r ${INST_TL_NAME}
${If} $Radio_Value != "unpack"
- ; create a copy of install-tl.bat which exits with an exit code
+ ; create a copy of install-tl-windows.bat which exits with an exit code
Push $0
- File /oname=${INST_TL_NAME}\inst_mod.bat ${INST_TL_NAME}\install-tl.bat
+ File /oname=${INST_TL_NAME}\inst_mod.bat ${INST_TL_NAME}\install-tl-windows.bat
FileOpen $0 ${INST_TL_NAME}\inst_mod.bat a
FileSeek $0 0 END
FileWrite $0 "if errorlevel 1 (exit 1) else (exit 0)"
@@ -281,7 +282,7 @@ Section
${ElseIf} $0 == "timeout"
MessageBox MB_ICONSTOP|MB_OK "Timeout"
${ElseIf} $0 <> 0
- MessageBox MB_ICONSTOP|MB_OK "Error; for better info, unpack,$\r$\nthen run install.bat or install-advanced.bat."
+ MessageBox MB_ICONSTOP|MB_OK "Error; for better info, unpack,$\r$\nthen run install-tl-windows.bat or install-tl-advanced.bat."
; ${Else}
; MessageBox MB_ICONSTOP|MB_OK "No error"
${EndIf}
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index f067c888ee8..51dec2f62ac 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -23,7 +23,6 @@ runpattern !f tlpkg/installer/tar.exe
# Windows only:
binpattern d/win32 tlpkg/tlperl
binpattern f/win32 tlpkg/installer/tar.exe
-binpattern f/win32 install-tl.bat
binpattern f/win32 install-tl-windows.bat
binpattern f/win32 install-tl-advanced.bat
#
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index dd8b5158204..0e91aa551a7 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -18,7 +18,6 @@ runpattern f install-tl
runpattern f tlpkg/installer/install-menu-*.pl
runpattern f tlpkg/installer/ctan-mirrors.pl
runpattern f tlpkg/installer/texlive.png
-binpattern f/win32 install-tl.bat
binpattern f/win32 install-tl-windows.bat
binpattern f/win32 install-tl-advanced.bat
docpattern f texmf-dist/doc/man/man1/install-tl.*