Commit 9927806d authored by aker@wsusoffline's avatar aker@wsusoffline

- reintroduced the "/excludesp"-option for the download part (Thanks to "negg")

parent b7676571
......@@ -14,7 +14,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.4.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.4 (b3)"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.4 (b4)"
Dim Const $title = $caption & " - Generator"
Dim Const $downloadURL = "https://gitlab.com/wsusoffline/"
Dim Const $downloadLogFile = "download.log"
......@@ -89,7 +89,7 @@ Dim Const $iso_token_skiphashes = "skiphashes"
Dim Const $usb_token_copy = "copy"
Dim Const $usb_token_path = "path"
Dim Const $usb_token_cleanup = "cleanup"
Dim Const $opts_token_allowsp = "allowsp"
Dim Const $opts_token_excludesp = "excludesp"
Dim Const $opts_token_includedotnet = "includedotnet"
Dim Const $opts_token_allowdotnet = "allowdotnet"
Dim Const $opts_token_seconly = "seconly"
......@@ -560,6 +560,9 @@ EndFunc
Func DetermineDownloadSwitches($chkbox_dotnet, $chkbox_seconly, $chkbox_wddefs, $chkbox_verifydownloads, $strproxy, $strwsus)
Dim $result = ""
If IniRead($inifilename, $ini_section_opts, $opts_token_excludesp, $disabled) = $enabled Then
$result = $result & " /excludesp"
EndIf
If IsCheckBoxChecked($chkbox_dotnet) Then
$result = $result & " /includedotnet"
EndIf
......
......@@ -15,7 +15,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.4.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.4 (b3) - Installer"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.4 (b4) - 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.4 (b3)
set WSUSOFFLINE_VERSION=12.4 (b4)
title %~n0 %*
echo Starting WSUS Offline Update - Community Edition - v. %WSUSOFFLINE_VERSION% at %TIME%...
set UPDATE_LOGFILE=%SystemRoot%\wsusofflineupdate.log
......
2939087
2975061
kb2939087
kb2975061
clearcompressionflag
2919355
2932046
2959977
2937592
2938439
2934018
kb2919355
kb2932046
kb2959977
kb2937592
kb2938439
kb2934018
3000850
3003057
3014442
kb3000850
kb3003057
kb3014442
......@@ -12,6 +12,7 @@ setlocal enableextensions enabledelayedexpansion
if errorlevel 1 goto NoExtensions
rem clear vars storing parameters
set EXC_SP=
set EXC_STATICS=
set EXC_WINGLB=
set INC_DOTNET=
......@@ -34,7 +35,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=12.4 (b3)
set WSUSOFFLINE_VERSION=12.4 (b4)
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
......@@ -176,9 +177,10 @@ goto EvalParams
:EvalParams
if "%3"=="" goto NoMoreParams
for %%i in (/excludestatics /excludewinglb /includedotnet /seconly /includewddefs /nocleanup /verify /exitonerror /skipsdd /skiptz /skipdownload /skipdynamic /proxy /wsus /wsusonly /wsusbyproxy) do (
for %%i in (/excludesp /excludestatics /excludewinglb /includedotnet /seconly /includewddefs /nocleanup /verify /exitonerror /skipsdd /skiptz /skipdownload /skipdynamic /proxy /wsus /wsusonly /wsusbyproxy) do (
if /i "%3"=="%%i" call :Log "Info: Option %%i detected"
)
if /i "%3"=="/excludesp" set EXC_SP=1
if /i "%3"=="/excludestatics" set EXC_STATICS=1
if /i "%3"=="/excludewinglb" set EXC_WINGLB=1
if /i "%3"=="/includedotnet" set INC_DOTNET=1
......@@ -1324,6 +1326,10 @@ if not exist "%TEMP%\StaticDownloadLinks-%1-%2.txt" goto SkipStatics
:EvalStatics
if exist "%TEMP%\ExcludeListStatic.txt" del "%TEMP%\ExcludeListStatic.txt"
if exist ..\exclude\custom\ExcludeListForce-all.txt copy /Y ..\exclude\custom\ExcludeListForce-all.txt "%TEMP%\ExcludeListStatic.txt" >nul
if "%EXC_SP%"=="1" (
type "..\client\static\StaticUpdateIds-w63-upd1.txt" >>"%TEMP%\ExcludeListStatic.txt"
type "..\client\static\StaticUpdateIds-w63-upd2.txt" >>"%TEMP%\ExcludeListStatic.txt"
)
rem *** Windows 10 version specific exclusion ***
set DISABLED1903=
set DISABLED1909=
......@@ -1338,9 +1344,9 @@ if not errorlevel 1 (
if exist ..\exclude\ExcludeList-w100-%%i.txt type ..\exclude\ExcludeList-w100-%%i.txt >>"%TEMP%\ExcludeListStatic.txt"
if exist ..\exclude\custom\ExcludeList-w100-%%i.txt type ..\exclude\custom\ExcludeList-w100-%%i.txt >>"%TEMP%\ExcludeListStatic.txt"
if "%%i"=="1903" set DISABLED1903=1
if "%%i"=="1909" set DISABLED1909=1
if "%%i"=="1909" set DISABLED1909=1
if "%%i"=="2004" set DISABLED2004=1
if "%%i"=="20H2" set DISABLED20H2=1
if "%%i"=="20H2" set DISABLED20H2=1
)
)
)
......@@ -1477,6 +1483,10 @@ if not errorlevel 1 (
if exist ..\exclude\custom\ExcludeListForce-all.txt (
type ..\exclude\custom\ExcludeListForce-all.txt >>"%TEMP%\ExcludeList-%1.txt"
)
if "%EXC_SP%"=="1" (
type "..\client\static\StaticUpdateIds-w63-upd1.txt" >>"%TEMP%\ExcludeList-%1.txt"
type "..\client\static\StaticUpdateIds-w63-upd2.txt" >>"%TEMP%\ExcludeList-%1.txt"
)
for %%i in ("%TEMP%\ExcludeList-%1.txt") do if %%~zi==0 del %%i
if exist "%TEMP%\ExcludeList-%1.txt" (
%SystemRoot%\System32\findstr.exe /L /I /V /G:"%TEMP%\ExcludeList-%1.txt" "%TEMP%\CurrentDynamicLinks-%1-%2.txt" >"%TEMP%\ValidDynamicLinks-%1-%2.txt"
......
......@@ -1775,4 +1775,5 @@ Community Edition 12.4 -- ??.??.2020
- Support removed for Windows 10 version 1709 since Microsoft discontinued support for it on October 13th, 2020
- Support removed for Office 2010 since Microsoft discontinued support for it on October 13th, 2020
- cleaned up ExcludeList-ofc*.txt
- reintroduced the "/excludesp"-option for the download part (Thanks to "negg")
- Fix: The self-update did not report more recent versions in UpdateGenerator (Thanks to "negg")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment