Add support for the new SSU file name
This commit is contained in:
parent
59b988c5ec
commit
cd9ef102d7
8
get.php
8
get.php
@ -198,7 +198,7 @@ function uupGetFiles(
|
|||||||
switch($fileListSource) {
|
switch($fileListSource) {
|
||||||
case 'UPDATEONLY':
|
case 'UPDATEONLY':
|
||||||
$skipPackBuild = 1;
|
$skipPackBuild = 1;
|
||||||
$removeFiles = preg_grep('/Windows10\.0-KB.*-EXPRESS/i', $filesInfoKeys);
|
$removeFiles = preg_grep('/Windows10\.0-KB.*-EXPRESS|SSU-\d*?\.\d*?-.{3,5}-EXPRESS/i', $filesInfoKeys);
|
||||||
|
|
||||||
foreach($removeFiles as $val) {
|
foreach($removeFiles as $val) {
|
||||||
if(isset($filesInfoList[$val])) unset($filesInfoList[$val]);
|
if(isset($filesInfoList[$val])) unset($filesInfoList[$val]);
|
||||||
@ -207,7 +207,7 @@ function uupGetFiles(
|
|||||||
|
|
||||||
$filesInfoKeys = array_keys($filesInfoList);
|
$filesInfoKeys = array_keys($filesInfoList);
|
||||||
|
|
||||||
$filesInfoKeys = preg_grep('/Windows10\.0-KB/i', $filesInfoKeys);
|
$filesInfoKeys = preg_grep('/Windows10\.0-KB|SSU-\d*?\.\d*?-.{3,5}/i', $filesInfoKeys);
|
||||||
if(count($filesInfoKeys) == 0) {
|
if(count($filesInfoKeys) == 0) {
|
||||||
return array('error' => 'NOT_CUMULATIVE_UPDATE');
|
return array('error' => 'NOT_CUMULATIVE_UPDATE');
|
||||||
}
|
}
|
||||||
@ -224,8 +224,8 @@ function uupGetFiles(
|
|||||||
if($updateSku == 135) $uupCleanFunc = 'uupCleanHolo';
|
if($updateSku == 135) $uupCleanFunc = 'uupCleanHolo';
|
||||||
|
|
||||||
if($fileListSource == 'GENERATEDPACKS') {
|
if($fileListSource == 'GENERATEDPACKS') {
|
||||||
$temp = preg_grep('/Windows10\.0-KB.*-EXPRESS/i', $filesInfoKeys, PREG_GREP_INVERT);
|
$temp = preg_grep('/Windows10\.0-KB.*-EXPRESS|SSU-\d*?\.\d*?-.{3,5}-EXPRESS/i', $filesInfoKeys, PREG_GREP_INVERT);
|
||||||
$temp = preg_grep('/Windows10\.0-KB/i', $temp);
|
$temp = preg_grep('/Windows10\.0-KB|SSU-\d*?\.\d*?-.{3,5}/i', $temp);
|
||||||
$filesPacksList = array_merge($filesPacksList, $temp);
|
$filesPacksList = array_merge($filesPacksList, $temp);
|
||||||
|
|
||||||
$newFiles = array();
|
$newFiles = array();
|
||||||
|
Loading…
Reference in New Issue
Block a user