diff --git a/fetchupd.php b/fetchupd.php index ad432bb..71258a9 100644 --- a/fetchupd.php +++ b/fetchupd.php @@ -1,6 +1,6 @@ .*?<\/UpdateInfo>/', $out, $updateInfos); @@ -128,13 +128,19 @@ function uupFetchUpd($arch = 'amd64', $ring = 'WIF', $flight = 'Active', $build $updateRev = preg_replace('/RevisionNumber="|"$/', '', $updateRev[0]); consoleLogger('Successfully checked build information.'); - consoleLogger('BUILD: '.$updateTitle.' '.$arch); $updateString = $updateId; if($updateRev != 1) { $updateString = $updateId.'_rev.'.$updateRev; } + consoleLogger("--- UPDATE INFORMATION ---"); + consoleLogger("Title: ".$updateTitle); + consoleLogger("Architecture: ".$arch); + consoleLogger("Build number: ".$foundBuild); + consoleLogger("Update ID: ".$updateString); + consoleLogger("--- UPDATE INFORMATION ---"); + $fileWrite = 'NO_SAVE'; if(!file_exists('fileinfo/'.$updateString.'.json')) { consoleLogger('WARNING: This build is NOT in the database. It will be saved now.'); diff --git a/shared/main.php b/shared/main.php index c697705..83ad6d2 100644 --- a/shared/main.php +++ b/shared/main.php @@ -16,7 +16,7 @@ limitations under the License. */ function uupApiVersion() { - return '1.10.2'; + return '1.10.3'; } function uupApiPrintBrand() { diff --git a/shared/packs.php b/shared/packs.php index d69de33..50653f6 100644 --- a/shared/packs.php +++ b/shared/packs.php @@ -59,6 +59,7 @@ function uupGetPacks($build = 15063) { $allEditions = array( 'ANALOGONECORE', + 'ANDROMEDA', 'CLOUD', 'CLOUDN', 'CORE', @@ -84,6 +85,7 @@ function uupGetPacks($build = 15063) { 'ENTERPRISESNEVAL', 'IOTUAP', 'MOBILECORE', + 'ONECOREUPDATEOS', 'PPIPRO', 'PROFESSIONAL', 'PROFESSIONALCOUNTRYSPECIFIC', @@ -146,12 +148,12 @@ function uupGetPacks($build = 15063) { if($build < 17063) { require dirname(__FILE__).'/packs/legacy.php'; - } elseif ($build >= 17063 && $build < 17093) { - require dirname(__FILE__).'/packs/17063.php'; - } elseif ($build >= 17093 && $build < 17623) { - require dirname(__FILE__).'/packs/17093.php'; } elseif ($build >= 17623) { require dirname(__FILE__).'/packs/17623.php'; + } elseif ($build >= 17093) { + require dirname(__FILE__).'/packs/17093.php'; + } elseif ($build >= 17063) { + require dirname(__FILE__).'/packs/17063.php'; } return array( diff --git a/shared/packs/17063.php b/shared/packs/17063.php index 09a8073..7f16f97 100644 --- a/shared/packs/17063.php +++ b/shared/packs/17063.php @@ -1,6 +1,6 @@ 'Windows 10 Home / Home Single Language', + 'CORE' => 'Windows 10 Home', 'CORECOUNTRYSPECIFIC' => 'Windows 10 Home China', 'COREN' => 'Windows 10 Home N', - 'PROFESSIONAL' => 'Windows 10 Pro / Enterprise / Education / S', - 'PROFESSIONALN' => 'Windows 10 Pro N / Enterprise N / Education N / S N', + 'PROFESSIONAL' => 'Windows 10 Pro', + 'PROFESSIONALN' => 'Windows 10 Pro N', ); ?> diff --git a/shared/packs/17093.php b/shared/packs/17093.php index 6bda8c8..acf7649 100644 --- a/shared/packs/17093.php +++ b/shared/packs/17093.php @@ -1,6 +1,6 @@ 'Windows 10 Home / Home Single Language', + 'CORE' => 'Windows 10 Home', 'CORECOUNTRYSPECIFIC' => 'Windows 10 Home China', 'COREN' => 'Windows 10 Home N', - 'PROFESSIONAL' => 'Windows 10 Pro / Enterprise / Education', - 'PROFESSIONALN' => 'Windows 10 Pro N / Enterprise N / Education N', + 'PROFESSIONAL' => 'Windows 10 Pro', + 'PROFESSIONALN' => 'Windows 10 Pro N', ); ?> diff --git a/shared/packs/17623.php b/shared/packs/17623.php index 703f19d..257eb8a 100644 --- a/shared/packs/17623.php +++ b/shared/packs/17623.php @@ -27,6 +27,7 @@ $packs = array( 'Microsoft-Windows-ContactSupport-Package', 'Microsoft-Windows-Not-Supported-On-LTSB-Package', 'Microsoft-Windows-Not-Supported-On-LTSB-WOW64-Package', + 'Microsoft-Windows-Not-Supported-On-LTSB-arm64arm-Package', 'Microsoft-Windows-RegulatedPackages-Package', 'Microsoft-Windows-RegulatedPackages-WOW64-Package', 'Microsoft-Windows-RegulatedPackages-arm64arm-Package', @@ -181,10 +182,10 @@ $editionPacks = array( ); $fancyEditionNames = array( - 'CORE' => 'Windows 10 Home / Home Single Language', + 'CORE' => 'Windows 10 Home', 'CORECOUNTRYSPECIFIC' => 'Windows 10 Home China', 'COREN' => 'Windows 10 Home N', - 'PROFESSIONAL' => 'Windows 10 Pro / Enterprise / Education', - 'PROFESSIONALN' => 'Windows 10 Pro N / Enterprise N / Education N', + 'PROFESSIONAL' => 'Windows 10 Pro', + 'PROFESSIONALN' => 'Windows 10 Pro N', ); ?>