diff --git a/setup/RunOnce.nsh b/setup/RunOnce.nsh index 85b1900..b8e8401 100644 --- a/setup/RunOnce.nsh +++ b/setup/RunOnce.nsh @@ -143,6 +143,13 @@ Function RebootIfRequired ${Else} ; Restore setup keys Call CleanUpRunOnce + ; Give the user a moment to understand we're rebooting + ${DetailPrint} "$(StatusRestarting)" + Sleep 2000 + ; Now reboot + Reboot + ; To be sure + Sleep 10000 ${EndIf} FunctionEnd diff --git a/setup/Strings.nsh b/setup/Strings.nsh index 19b5e5f..a8d5298 100644 --- a/setup/Strings.nsh +++ b/setup/Strings.nsh @@ -155,7 +155,7 @@ LangString SectionXPSP3Desc ${LANG_ENGLISH} \ LangString SectionXPESP3Desc ${LANG_ENGLISH} \ "Updates Windows XP Embedded to Service Pack 3. Required if you would like to activate Windows online. $(SectionReboots) $(SectionSupEULA)" LangString SectionWES09Desc ${LANG_ENGLISH} \ - "Configures Windows to appear as Windows Embedded POSReady 2009 to Windows Update, enabling access to Windows XP security updates released between 2014 and 2019. Please note that Microsoft officially advises against doing this." + "Configures Windows to appear as Windows Embedded POSReady 2009 to Windows Update, enabling access to Windows XP security updates released between 2014 and 2019. Please note that Microsoft officially advises against doing this, and some updates may not install properly." LangString Section2003SP2Desc ${LANG_ENGLISH} \ "Updates Windows XP Professional x64 Edition or Windows Server 2003 to Service Pack 2. Required if you would like to activate Windows online. $(SectionReboots) $(SectionSupEULA)" LangString SectionVistaSP2Desc ${LANG_ENGLISH} \ diff --git a/setup/setup.nsi b/setup/setup.nsi index b425127..fc7dd79 100644 --- a/setup/setup.nsi +++ b/setup/setup.nsi @@ -940,6 +940,7 @@ Function PreDownload Call DownloadWin7SP1 ${EndIf} + Call DownloadKB3102810 Call DownloadKB3138612 Call DownloadKB4474419 Call DownloadKB4490628 diff --git a/sign.cmd b/sign.cmd new file mode 100644 index 0000000..7d07087 --- /dev/null +++ b/sign.cmd @@ -0,0 +1,26 @@ +@echo off +:: Parameters +set certFile=%1 +set certPassword=%2 +set description=%3 +set file=%4 + +:: Sign the file with SHA1 +signtool sign /f %certFile% /p %certPassword% /tr http://timestamp.digicert.com /td sha256 /fd sha1 /v /d %description% %file% + +:: Check if SHA1 sign was successful +if %errorlevel% neq 0 ( + echo Error signing file with SHA1. + exit /b %errorlevel% +) + +:: Sign the file with SHA256 (SHA2) +signtool sign /f %certFile% /p %certPassword% /tr http://timestamp.digicert.com /td sha256 /fd sha256 /v /as /d %description% %file% + +:: Check if SHA256 sign was successful +if %errorlevel% neq 0 ( + echo Error signing file with SHA256. + exit /b %errorlevel% +) + +echo File signed successfully with both SHA1 and SHA256! \ No newline at end of file