diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c378600..e10405c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -24,10 +24,10 @@ jobs: md .\Release md .\x64\Release md .\launcher\obj - iwr https://ftp-vichingo455.duckdns.org/pub/WUIsBack/.github/LegacyUpdate32.dll -outfile '.\Release\LegacyUpdate.dll' - iwr https://ftp-vichingo455.duckdns.org/pub/WUIsBack/.github/LegacyUpdate64.dll -outfile '.\x64\Release\LegacyUpdate.dll' - iwr https://ftp-vichingo455.duckdns.org/pub/WUIsBack/.github/LegacyUpdate32.exe -outfile '.\launcher\obj\LegacyUpdate32.exe' - iwr https://ftp-vichingo455.duckdns.org/pub/WUIsBack/.github/LegacyUpdate64.exe -outfile '.\launcher\obj\LegacyUpdate64.exe' + iwr https://ftp.vichingo455.freeddns.org/pub/WUIsBack/.github/LegacyUpdate32.dll -outfile '.\Release\LegacyUpdate.dll' + iwr https://ftp.vichingo455.freeddns.org/pub/WUIsBack/.github/LegacyUpdate64.dll -outfile '.\x64\Release\LegacyUpdate.dll' + iwr https://ftp.vichingo455.freeddns.org/pub/WUIsBack/.github/LegacyUpdate32.exe -outfile '.\launcher\obj\LegacyUpdate32.exe' + iwr https://ftp.vichingo455.freeddns.org/pub/WUIsBack/.github/LegacyUpdate64.exe -outfile '.\launcher\obj\LegacyUpdate64.exe' - name: Compile WUIsBack run: | makensis "setup\setup.nsi" diff --git a/setup/Constants.nsh b/setup/Constants.nsh index bee0aee..e5e344a 100644 --- a/setup/Constants.nsh +++ b/setup/Constants.nsh @@ -36,8 +36,8 @@ !define WEBSITE "http://legacyupdate.net/" !define UPDATE_URL "http://legacyupdate.net/windowsupdate/v6/" !define UPDATE_URL_HTTPS "https://legacyupdate.net/windowsupdate/v6/" -!define WSUS_SERVER "http://vichingo455.ddns.net/v6" -!define WSUS_SERVER_HTTPS "https://vichingo455.ddns.net/v6" +!define WSUS_SERVER "http://update.vichingo455.freeddns.org" +!define WSUS_SERVER_HTTPS "https://update.vichingo455.freeddns.org" !define WUR_WEBSITE "http://windowsupdaterestored.com/" !define TRUSTEDR "http://download.windowsupdate.com/msdownload/update/v3/static/trustedr/en" diff --git a/setup/Patches.ini b/setup/Patches.ini index 0dfdac6..555bfcb 100644 --- a/setup/Patches.ini +++ b/setup/Patches.ini @@ -313,7 +313,7 @@ x86=windows6.1-kb976932-x86_c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa.exe x64=windows6.1-kb976932-x64_74865ef2562006e51d7f9333b4a8d45b7a749dab.exe [KB3102810] -Prefix=http://ftp-vichingo455.duckdns.org/pub/Updates/ +Prefix=http://ftp.vichingo455.freeddns.org/pub/Updates/ x86=Windows6.1-KB3102810-x86.msu x64=Windows6.1-KB3102810-x64.msu ia64=Windows6.1-KB3102810-ia64.msu diff --git a/setup/setup.nsi b/setup/setup.nsi index db43a69..b425127 100644 --- a/setup/setup.nsi +++ b/setup/setup.nsi @@ -115,8 +115,8 @@ Var /GLOBAL UninstallInstalled !include Strings.nsh ; Uncomment lines below to enable code signing when compiling under Windows -; !uninstfinalize 'sign.cmd certFile certPassword "Legacy Update - Vichingo455 Mod" "%1"' = 0 -; !finalize 'sign.cmd certFile certPassword "Legacy Update - Vichingo455 Mod" "%1"' = 0 +;!uninstfinalize 'sign.cmd certFile certPassword "Legacy Update - Vichingo455 Mod" "%1"' = 0 +;!finalize 'sign.cmd certFile certPassword "Legacy Update - Vichingo455 Mod" "%1"' = 0 !macro RestartWUAUService ${DetailPrint} "$(StatusRestartingWUAU)" @@ -343,11 +343,13 @@ ${MementoSection} "$(^Name)" LEGACYUPDATE ${If} $0 == "OK" ; HTTPS will work + ${VerbosePrint} "Using HTTPS WSUS server and update page." WriteRegStr HKLM "${REGPATH_WUPOLICY}" "WUServer" "${WSUS_SERVER_HTTPS}" WriteRegStr HKLM "${REGPATH_WUPOLICY}" "WUStatusServer" "${WSUS_SERVER_HTTPS}" WriteRegStr HKLM "${REGPATH_WU}" "URL" "${UPDATE_URL_HTTPS}" ${Else} ; Probably not supported; use HTTP + ${VerbosePrint} "Using HTTP WSUS server and update page." WriteRegStr HKLM "${REGPATH_WUPOLICY}" "WUServer" "${WSUS_SERVER}" WriteRegStr HKLM "${REGPATH_WUPOLICY}" "WUStatusServer" "${WSUS_SERVER}" WriteRegStr HKLM "${REGPATH_WU}" "URL" "${UPDATE_URL}" @@ -850,7 +852,7 @@ Function .onInit ; Try not to be too intrusive on Windows 10 and newer, which are (for now) fine ${If} ${AtLeastWin10} - !insertmacro RemoveSection ${ROOTCERTS} + ;!insertmacro RemoveSection ${ROOTCERTS} ${EndIf} ${IfNot} ${AtLeastWin7} @@ -984,12 +986,12 @@ Function PostInstall ${IfNot} ${Silent} ${AndIfNot} ${IsRunOnce} - ${If} ${FileExists} "$INSTDIR\LegacyUpdate.exe" - Exec '"$INSTDIR\LegacyUpdate.exe" /launch $0' - ${ElseIf} ${AtLeastWin10} + ${If} ${AtLeastWin10} ExecShell "" "ms-settings:windowsupdate" ${ElseIf} ${AtLeastWinVista} Exec '"$WINDIR\system32\wuauclt.exe" /ShowWUAutoScan' + ${ElseIf} ${FileExists} "$INSTDIR\LegacyUpdate.exe" + Exec '"$INSTDIR\LegacyUpdate.exe" /launch $0' ${EndIf} ; Launch activation wizard if requested by the user