Commit 846a9e3c authored by aker@wsusoffline's avatar aker@wsusoffline
Browse files

- update ExcludeList(s) after algorithm update

parent 66d9d6fc
......@@ -14,7 +14,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.5.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b17)"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b20)"
Dim Const $title = $caption & " - Generator"
Dim Const $downloadURL = "https://gitlab.com/wsusoffline/"
Dim Const $downloadLogFile = "download.log"
......
......@@ -15,7 +15,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.5.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b17) - Installer"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b20) - Installer"
; Registry constants
Dim Const $reg_key_wsh_hklm64 = "HKLM64\Software\Microsoft\Windows Script Host\Settings"
......
......@@ -30,7 +30,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=12.5 (b17)
set WSUSOFFLINE_VERSION=12.5 (b20)
title %~n0 %*
echo Starting WSUS Offline Update - Community Edition - v. %WSUSOFFLINE_VERSION% at %TIME%...
set UPDATE_LOGFILE=%SystemRoot%\wsusofflineupdate.log
......
......@@ -138,8 +138,8 @@ for /F "usebackq tokens=1,2 delims=," %%i in ("%TEMP%\MissingUpdateIds.txt") do
if not "%%j"=="" (
rem dynamisch ermittelte Updates als CAB
for %%k in (%OS_LANG% glb) do (
if exist ..\UpdateTable\UpdateTable-%OS_NAME%-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\UpdateTable\UpdateTable-%OS_NAME%-%%k.csv) do (
if exist ..\wsus\UpdateTable-%OS_NAME%-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-%OS_NAME%-%%k.csv) do (
if "%%l"=="%%j" (
call ListUpdateFile.cmd %%m ..\%OS_SEARCH_DIR%\%%k /searchleftmost /append
)
......@@ -148,8 +148,8 @@ for /F "usebackq tokens=1,2 delims=," %%i in ("%TEMP%\MissingUpdateIds.txt") do
)
if not "%O2K13_VER_MAJOR%"=="" (
for %%k in (%O2K13_LANG% glb) do (
if exist ..\UpdateTable\UpdateTable-o2k13-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\UpdateTable\UpdateTable-o2k13-%%k.csv) do (
if exist ..\wsus\UpdateTable-o2k13-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-o2k13-%%k.csv) do (
if "%%l"=="%%j" (
call ListUpdateFile.cmd %%m ..\o2k13\%%k /searchleftmost /append
)
......@@ -159,8 +159,8 @@ for /F "usebackq tokens=1,2 delims=," %%i in ("%TEMP%\MissingUpdateIds.txt") do
)
if not "%O2K16_VER_MAJOR%"=="" (
for %%k in (%O2K16_LANG% glb) do (
if exist ..\UpdateTable\UpdateTable-o2k16-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\UpdateTable\UpdateTable-o2k16-%%k.csv) do (
if exist ..\wsus\UpdateTable-o2k16-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-o2k16-%%k.csv) do (
if "%%l"=="%%j" (
call ListUpdateFile.cmd %%m ..\o2k16\%%k /searchleftmost /append
)
......
......@@ -35,7 +35,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=12.5 (b17)
set WSUSOFFLINE_VERSION=12.5 (b20)
title %~n0 %1 %2 %3 %4 %5 %6 %7 %8 %9
echo Starting WSUS Offline Update - Community Edition - download v. %WSUSOFFLINE_VERSION% for %1 %2...
set DOWNLOAD_LOGFILE=..\log\download.log
......@@ -281,7 +281,6 @@ if exist ..\static\sdd\dummy.txt del ..\static\sdd\dummy.txt
if exist ..\client\exclude\custom\dummy.txt del ..\client\exclude\custom\dummy.txt
if exist ..\client\static\custom\dummy.txt del ..\client\static\custom\dummy.txt
if exist ..\client\software\msi\dummy.txt del ..\client\software\msi\dummy.txt
if exist ..\client\UpdateTable\dummy.txt del ..\client\UpdateTable\dummy.txt
if exist .\custom\InitializationHook.cmd (
if exist .\custom\InitializationHook.cmdt del .\custom\InitializationHook.cmdt
)
......@@ -316,6 +315,8 @@ if exist ActivateFiveLanguageServicePacks.cmd del ActivateFiveLanguageServicePac
if exist RemoveEnglishLanguageSupport.cmd del RemoveEnglishLanguageSupport.cmd
if exist ..\doc\faq.txt del ..\doc\faq.txt
if exist ..\exclude\ExcludeList-SPs.txt del ..\exclude\ExcludeList-SPs.txt
if exist ..\exclude\ExcludeList-dotnet-x86.txt del ..\exclude\ExcludeList-dotnet-x86.txt
if exist ..\exclude\ExcludeList-dotnet-x64.txt del ..\exclude\ExcludeList-dotnet-x64.txt
if exist ..\client\cmd\Reboot.vbs del ..\client\cmd\Reboot.vbs
if exist ..\client\cmd\Shutdown.vbs del ..\client\cmd\Shutdown.vbs
if exist ..\client\msi\nul rd /S /Q ..\client\msi
......@@ -810,7 +811,7 @@ call :Log "Info: Downloaded/validated most recent Windows Update catalog file"
if "%VERIFY_DL%" NEQ "1" goto SkipWSUS
if not exist %SIGCHK_PATH% goto NoSigCheck
echo Verifying digital file signature of Windows Update catalog file...
for /F "skip=1 tokens=1 delims=," %%i in ('%SIGCHK_PATH% %SIGCHK_COPT% -s ..\client\wsus ^| %SystemRoot%\System32\findstr.exe /I /V "\"Signed\""') do (
for /F "skip=1 tokens=1 delims=," %%i in ('%SIGCHK_PATH% %SIGCHK_COPT% ..\client\wsus\wsusscn2.* ^| %SystemRoot%\System32\findstr.exe /I /V "\"Signed\""') do (
del %%i
echo Warning: Deleted unsigned file %%i.
call :Log "Warning: Deleted unsigned file '%%~i'"
......@@ -1397,7 +1398,6 @@ if "%4"=="/skipdynamic" (
call :Log "Info: Skipped determination of dynamic update urls for %1 %2 on demand"
goto DoDownload
)
if not exist ..\client\UpdateTable\nul md ..\client\UpdateTable
set PLATFORM_WINDOWS=w62 w63 w100
set PLATFORM_OFFICE=o2k13 o2k16
......@@ -1520,12 +1520,12 @@ if "%2"=="glb" (
goto DetermineShared
:DetermineShared
rem Create the files ../client/UpdateTable/UpdateTable-*-*.csv, which are
rem Create the files ../client/wsus/UpdateTable-*-*.csv, which are
rem needed during the installation of the updates. They link the UpdateIds
rem (in form of UUIDs) to the file names.
echo Creating file 7, UpdateTable-%TMP_PLATFORM%-%2.csv ...
call :Log "Info: Creating file 7, UpdateTable-%TMP_PLATFORM%-%2.csv ..."
%CSCRIPT_PATH% //Nologo //B //E:vbs ExtractIdsAndFileNames.vbs "%TEMP%\update-ids-and-locations-%2.txt" ..\client\UpdateTable\UpdateTable-%TMP_PLATFORM%-%2.csv
%CSCRIPT_PATH% //Nologo //B //E:vbs ExtractIdsAndFileNames.vbs "%TEMP%\update-ids-and-locations-%2.txt" ..\client\wsus\UpdateTable-%TMP_PLATFORM%-%2.csv
rem At this point, the UpdateIds are no longer needed. Only the locations
rem (URLs) are needed to create the initial list of dynamic download
......@@ -1555,31 +1555,30 @@ rem only, to get the final list of valid dynamic download links
echo Creating file 10, ValidDynamicLinks-%1-%2.txt ...
call :Log "Info: Creating file 10, ValidDynamicLinks-%1-%2.txt ..."
if exist "%TEMP%\ExcludeList-%1.txt" del "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\ExcludeList-%1.txt (
type ..\exclude\ExcludeList-%1.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1.txt type ..\exclude\custom\ExcludeList-%1.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%1-%3.txt (
type ..\exclude\ExcludeList-%1-%3.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1-%3.txt type ..\exclude\custom\ExcludeList-%1-%3.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%-%3.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%-%3.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%-%2.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%2.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%-%3-%2.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%-%3-%2.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3-%2.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if not "%2"=="glb" (
if exist ..\exclude\ExcludeList-%1-%2.txt (
type ..\exclude\ExcludeList-%1-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1-%2.txt type ..\exclude\custom\ExcludeList-%1-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%1-%3-%2.txt (
type ..\exclude\ExcludeList-%1-%3-%2.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1-%3-%2.txt type ..\exclude\custom\ExcludeList-%1-%3-%2.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%1-lng.txt (
type ..\exclude\ExcludeList-%1-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1-lng.txt type ..\exclude\custom\ExcludeList-%1-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%-lng.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-lng.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if exist ..\exclude\ExcludeList-%1-%3-lng.txt (
type ..\exclude\ExcludeList-%1-%3-lng.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%1-%3-lng.txt type ..\exclude\custom\ExcludeList-%1-%3-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\ExcludeList-%TMP_PLATFORM%-%3-lng.txt (
type ..\exclude\ExcludeList-%TMP_PLATFORM%-%3-lng.txt >> "%TEMP%\ExcludeList-%1.txt"
if exist ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3-lng.txt type ..\exclude\custom\ExcludeList-%TMP_PLATFORM%-%3-lng.txt >>"%TEMP%\ExcludeList-%1.txt"
)
)
......
......@@ -5,6 +5,7 @@ ProductIds-final.txt
ProductIds-final-inverted.txt
ExcludeList-ProductionTree.txt
ExcludeList-ReleaseTree.txt
ExcludeList-w100_documented.txt
ico\
Include\
extract-revision-and-update-ids.xsl
......
kb886903
kb928366
kb971108
ndp20
ndp30
kb971111
ndp35-
ndp40-
kb3057781
kb2737083
kb2742613
kb2840642
kb2861193
kb2861208
kb2894854
kb2898864
kb2898869
kb2901118
kb4055002
kb886903
kb928366
kb971108
ndp1.1
ndp20
ndp30
kb971111
ndp35-
ndp40-
kb3057781
kb2737083
kb2742613
kb2840642
kb2861193
kb2861208
kb2894854
kb2898864
kb2898869
kb2901118
kb4055002
visio-x-none_07b0f5d3fd13c18f3c45622f981e9264676aeb19
visio-x-none_1cc3c1675892d1fa1b05df167f2abfa565e38fa9
......@@ -4,5 +4,3 @@ intl-
/ime64
/proof
/msconv_
visio-x-none_07b0f5d3fd13c18f3c45622f981e9264676aeb19
visio-x-none_1cc3c1675892d1fa1b05df167f2abfa565e38fa9
kb890830
kb4022727
kb3135173
kb3140743
kb3140768
kb3147458
kb3156421
kb3163018
kb3172985
kb3176493
kb3185614
kb3192441
kb3198586
kb3205386
kb3210721
kb4013198
kb4016636
kb4015219
kb4019473
kb4022714
kb4032693
kb4025344
kb4034660
kb4038783
kb4041689
kb4052232
kb4048952
kb4053578
kb4056888
kb4075200
kb4074591
kb4088779
kb4093109
windows10.0-kb3172729-x64_bb12a14ec3891ec0a9e24edb529632263783d389
windows10.0-kb3173428-x64_52fa3686737353fae20ab55fa9c924bd90558a31
windows10.0-kb4093110-x64_253a81268d68278e5701dd6c3cc3aec6bd338b34
kb4565912
kb4495610
kb4514354
kb4532933
kb4565551
kb4495611
kb4514355
kb4532934
kb4585208
windows10.0-kb4580325-x64_3b1d86e3b0a8f08875695db0290be6fdc2e9d652
kb4016251
kb4015583
kb4016240
kb4016871
kb4020102
kb4022725
kb4022716
kb4025342
kb4032188
kb4034674
kb4038788
kb4040724
kb4041676
kb4049370
kb4048954
kb4055254
kb4053580
kb4056891
kb4057144
kb4074592
kb4077528
kb4092077
kb4088782
kb4088891
kb4093107
kb4093117
kb4103731
kb4103722
kb4284874
kb4284830
kb4338826
kb4345419
kb4338827
kb4343885
kb4343889
kb4457138
kb4457141
kb4462937
kb4462939
kb4467696
kb4467699
kb4471327
kb4483230
kb4480973
kb4480959
kb4487020
kb4487011
kb4489871
kb4489888
kb4493474
kb4493436
kb4502112
kb4499181
kb4505055
kb4499162
kb4503279
kb4503289
kb4509476
kb4507450
kb4507467
kb4512507
kb4512474
kb4516068
kb4522011
kb4516059
kb4524151
kb4520010
kb4525245
kb4530711
kb4534296
kb4537765
kb4540705
kb4550939
kb4556804
kb4561605
kb4567516
kb4565499
kb4571689
kb4577021
kb4580370
kb4586782
kb4592473
kb4485448
kb4495613
kb4514356
kb4532935
kb4565553
kb4578971
windows10.0-kb4580325-x64_74325b1fdca59571e77662addfb630665ca35663
kb4493441
kb4580328
kb4523203
kb4495616
kb4514357
kb4532936
kb4537762
kb4087658
kb4093296
kb4580363
kb4583287
kb4495590
kb4514366
kb4532947
kb4565625
kb4569776
kb4570720
kb4495618
kb4514358
kb4532937
kb4565632
kb4569750
kb4495620
kb4514359
kb4532938
kb4565633
kb4569751
kb4557968
kb4570334
kb4565627
kb4569745
kb890830
kb4022727
kb3135173
kb3140743
kb3140768
kb3147458
kb3156421
kb3163018
kb3172985
kb3176493
kb3185614
kb3192441
kb3198586
kb3205386
kb3210721
kb4013198
kb4016636
kb4015219
kb4019473
kb4022714
kb4032693
kb4025344
kb4034660
kb4038783
kb4041689
kb4052232
kb4048952
kb4053578
kb4056888
kb4075200
kb4074591
kb4088779
kb4093109
windows10.0-kb3172729-x86_ea33b213bf595af9948003317c2b107957ffb688
windows10.0-kb3173428-x86_ca1c1011459b7b59a5858a28f1db4bfa2c488b2e
windows10.0-kb4093110-x86_0d8fd79563fe7b7dd00dcf99e2001e9ef391b207
kb4565912
kb4495610
kb4514354
kb4532933
kb4565551
kb4495611
kb4514355
kb4532934
kb4585208
windows10.0-kb4580325-x86_b9f0ad9ec107de5e932ce3c50151b500c5b83f44
kb4016251
kb4015583
kb4016240
kb4016871
kb4020102
kb4022725
kb4022716
kb4025342
kb4032188
kb4034674
kb4038788
kb4040724
kb4041676
kb4049370
kb4048954
kb4055254
kb4053580
kb4056891
kb4057144
kb4074592
kb4077528
kb4092077
kb4088782
kb4088891
kb4093107
kb4093117
kb4103731
kb4103722
kb4284874
kb4284830
kb4338826
kb4345419
kb4338827
kb4343885
kb4343889
kb4457138
kb4457141
kb4462937
kb4462939
kb4467696
kb4467699
kb4471327
kb4483230
kb4480973
kb4480959
kb4487020
kb4487011
kb4489871
kb4489888
kb4493474
kb4493436
kb4502112
kb4499181
kb4505055
kb4499162
kb4503279
kb4503289
kb4509476
kb4507450
kb4507467
kb4512507
kb4512474
kb4516068
kb4522011
kb4516059
kb4524151
kb4520010
kb4525245
kb4530711
kb4534296
kb4537765
kb4540705
kb4550939
kb4556804
kb4561605
kb4567516
kb4565499
kb4571689
kb4577021
kb4580370
kb4586782
kb4592473
kb4485448
kb4495613
kb4514356
kb4532935
kb4565553
kb4578971
windows10.0-kb4580325-x86_0802e6afdf60ab348a5d9d56271052ef09cbbebb
kb4493441
kb4580328
kb4523203
kb4495616
kb4514357
kb4532936
kb4537762
kb4087658
kb4093296
kb4580363
kb4583287
kb4495590
kb4514366
kb4532947
kb4565625
kb4569776
kb4570720
kb4495618
kb4514358
kb4532937
kb4565632
kb4569750
kb4495620
kb4514359
kb4532938
kb4565633
kb4569751
kb4557968
kb4570334
kb4565627
kb4569745
kb890830
kb4022727
kb4093109
windows10.0-kb3172729-x64_bb12a14ec3891ec0a9e24edb529632263783d389
windows10.0-kb3172729-x86_ea33b213bf595af9948003317c2b107957ffb688
windows10.0-kb3173428-x64_52fa3686737353fae20ab55fa9c924bd90558a31
windows10.0-kb3173428-x86_ca1c1011459b7b59a5858a28f1db4bfa2c488b2e
windows10.0-kb4093110-x64_253a81268d68278e5701dd6c3cc3aec6bd338b34
windows10.0-kb4093110-x86_0d8fd79563fe7b7dd00dcf99e2001e9ef391b207
kb4495610
kb4514354
kb4532933
kb4565551
kb4495611
kb4514355
kb4532934
kb4578970
windows10.0-kb4580325-x64_3b1d86e3b0a8f08875695db0290be6fdc2e9d652
windows10.0-kb4580325-x86_b9f0ad9ec107de5e932ce3c50151b500c5b83f44
kb4462937
kb4592473
kb4485448
kb4495613
kb4514356
kb4532935
kb4565553
kb4578971
windows10.0-kb4580325-x64_74325b1fdca59571e77662addfb630665ca35663
windows10.0-kb4580325-x86_0802e6afdf60ab348a5d9d56271052ef09cbbebb
kb4493441
kb4580328
kb4523203
kb4495616
kb4514357
kb4532936
kb4537762
kb4087658
kb4093296
kb4495590
kb4514366
kb4532947
kb4565625
kb4569776
kb4495618
kb4514358
kb4532937
kb4565632
kb4569750
g_f0907fa8d8b7eda334ad7931f90469aa7c638d8f.exe
g_afee18512c4c7ce4cd8728fed25d431281b1d81e.exe
kb4495620
kb4514359
kb4532938
kb4565633
kb4569751
kb4565627
kb4569745