Commit d2e6912a authored by aker@wsusoffline's avatar aker@wsusoffline
Browse files

- revert the location of UpdateTable-*.csv back to pre-b20 (Thanks to "Gerby")

parent b9fdc297
......@@ -14,7 +14,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 11.9.8)
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b20.1)"
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b21)"
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, 11.9.8)
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b20.1) - Installer"
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b21) - Installer"
; Registry constants
Dim Const $reg_key_wsh_hklm64 = "HKLM64\Software\Microsoft\Windows Script Host\Settings"
......
......@@ -32,7 +32,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=11.9.8 (b20.1)
set WSUSOFFLINE_VERSION=11.9.8 (b21)
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 ..\wsus\UpdateTable-%OS_NAME%-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-%OS_NAME%-%%k.csv) 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 "%%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 ..\wsus\UpdateTable-o2k13-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-o2k13-%%k.csv) do (
if exist ..\UpdateTable\UpdateTable-o2k13-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\UpdateTable\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 ..\wsus\UpdateTable-o2k16-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\wsus\UpdateTable-o2k16-%%k.csv) do (
if exist ..\UpdateTable\UpdateTable-o2k16-%%k.csv (
for /F "tokens=1,2 delims=," %%l in (..\UpdateTable\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=11.9.8 (b20.1)
set WSUSOFFLINE_VERSION=11.9.8 (b21)
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
......@@ -765,7 +765,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% ..\client\wsus\wsusscn2.* ^| %SystemRoot%\System32\findstr.exe /I /V "\"Signed\""') do (
for /F "skip=1 tokens=1 delims=," %%i in ('%SIGCHK_PATH% %SIGCHK_COPT% -s ..\client\wsus ^| %SystemRoot%\System32\findstr.exe /I /V "\"Signed\""') do (
del %%i
echo Warning: Deleted unsigned file %%i.
call :Log "Warning: Deleted unsigned file '%%~i'"
......@@ -1426,6 +1426,7 @@ 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=w60 w61 w62 w63 w100
set PLATFORM_OFFICE=o2k13 o2k16
......@@ -1548,12 +1549,12 @@ if "%2"=="glb" (
goto DetermineShared
:DetermineShared
rem Create the files ../client/wsus/UpdateTable-*-*.csv, which are
rem Create the files ../client/UpdateTable/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\wsus\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
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
......
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