summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/libexec/install-tl.nsi55
1 files changed, 7 insertions, 48 deletions
diff --git a/Master/tlpkg/libexec/install-tl.nsi b/Master/tlpkg/libexec/install-tl.nsi
index 86e58f98c1b..86d7306da5d 100644
--- a/Master/tlpkg/libexec/install-tl.nsi
+++ b/Master/tlpkg/libexec/install-tl.nsi
@@ -42,8 +42,6 @@ SetCompressor /SOLID bzip2
Var Dialog
Var Label
Var RadioSimple
-Var RadioAdvanced
-Var RadioExperimental
Var RadioUnpack
; Controls: confirmation page
@@ -134,27 +132,17 @@ Function tlOptionsPage
${NSD_CreateLabel} 0 0 100% 24u $Admin_warning
Pop $Label
- ${NSD_CreateRadioButton} 0 35u 100% 9u "Simple install (big)"
+ ${NSD_CreateRadioButton} 0 45u 100% 9u "Install"
Pop $RadioSimple
${NSD_SetUserData} $RadioSimple $Radio_Default ; set to "simple" in .onInit
- ${NSD_CreateRadioButton} 0 50u 100% 9u "Custom install"
- Pop $RadioAdvanced
- ${NSD_SetUserData} $RadioAdvanced "advanced"
-
- ${NSD_CreateRadioButton} 0 65u 100% 9u "Experimental install"
- Pop $RadioExperimental
- ${NSD_SetUserData} $RadioExperimental "experimental"
-
- ${NSD_CreateRadioButton} 0 80u 100% 9u "Unpack only"
+ ${NSD_CreateRadioButton} 0 75u 100% 9u "Unpack only"
Pop $RadioUnpack
${NSD_SetUserData} $RadioUnpack "unpack"
Call Value_to_States
${NSD_OnClick} $RadioSimple UpdateRadio
- ${NSD_OnClick} $RadioAdvanced UpdateRadio
- ${NSD_OnClick} $RadioExperimental UpdateRadio
${NSD_OnClick} $RadioUnpack UpdateRadio
nsDialogs::Show
@@ -167,7 +155,7 @@ Function tlOptionsPageLeave
${If} $Radio_Value == "unpack"
StrCpy $INSTDIR "$DESKTOP"
StrCpy $Completed_text \
- "Done unpacking; next run install-tl-windows.bat or install-tl-advanced.bat."
+ "Done unpacking; next run install-tl-windows.bat."
StrCpy $InstOrUnpack "Unpack"
;StrCpy $NextOrUnpack "Next"
${Else}
@@ -181,21 +169,11 @@ FunctionEnd
Function Value_to_States
${NSD_Uncheck} $RadioSimple
- ${NSD_Uncheck} $RadioAdvanced
- ${NSD_Uncheck} $RadioExperimental
${NSD_Uncheck} $RadioUnpack
${NSD_GetUserData} $RadioSimple $Radio_Temp
${If} $Radio_Temp == $Radio_Value
${NSD_Check} $RadioSimple
${EndIf}
- ${NSD_GetUserData} $RadioAdvanced $Radio_Temp
- ${If} $Radio_Temp == $Radio_Value
- ${NSD_Check} $RadioAdvanced
- ${EndIf}
- ${NSD_GetUserData} $RadioExperimental $Radio_Temp
- ${If} $Radio_Temp == $Radio_Value
- ${NSD_Check} $RadioExperimental
- ${EndIf}
${NSD_GetUserData} $RadioUnpack $Radio_Temp
${If} $Radio_Temp == $Radio_Value
${NSD_Check} $RadioUnpack
@@ -225,16 +203,10 @@ 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-windows.bat or install-tl-advanced.bat."
- ${ElseIf} $Radio_Value == "experimental"
- ${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..."
- ${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..."
+ "The main installer will be unpacked into $INSTDIR\${INST_TL_NAME}.$\r$\n$\r$\nStart the main installer with install-tl-windows.bat."
${Else}
${NSD_CreateLabel} 0 30% 100% 80u \
- "Click 'Install' to start the main installer,$\r$\nwhich lets you select an installation directory.$\r$\n$\r$\nUnpacking the main installer may take a few moments..."
+ "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..."
${EndIf}
Pop $Explain
@@ -269,7 +241,7 @@ Section
; production code:
File /r ${INST_TL_NAME}
- ${If} $Radio_Value != "unpack"
+ ${If} $Radio_Value == "simple"
; 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-windows.bat
@@ -279,28 +251,15 @@ Section
FileClose $0
Pop $0
DetailPrint "Starting the main installer:"
- ${EndIf}
-
- ${If} $Radio_Value == "advanced"
- DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui perltk $PARMS'
- nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui perltk $PARMS'
- Pop $0
- ${ElseIf} $Radio_Value == "experimental"
- DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui tcl $PARMS'
- nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui tcl $PARMS'
- Pop $0
- ${ElseIf} $Radio_Value == "simple"
DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" $PARMS'
nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" $PARMS'
Pop $0
- ${EndIf}
- ${If} $Radio_Value != "unpack"
${If} $0 == "error"
MessageBox MB_ICONSTOP|MB_OK "Error; see details"
${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-tl-windows.bat or install-tl-advanced.bat."
+ MessageBox MB_ICONSTOP|MB_OK "Error; for better info, unpack,$\r$\nthen run install-tl-windows.bat."
; ${Else}
; MessageBox MB_ICONSTOP|MB_OK "No error"
${EndIf}