0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

System update (better installation)

Browse source
This commit is contained in:
markseu 2016-07-30 02:58:14 +02:00
parent 853b17f1de
commit 42e9e96321
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
system/plugins/installation-blog.zip.download → system/plugins/update-blog.zip.download
View file

0
system/plugins/installation-wiki.zip.download → system/plugins/update-wiki.zip.download
View file

13
system/plugins/update.php
View file

@ -249,8 +249,13 @@ class YellowUpdate
if(preg_match("/$feature/i", basename($entry)))
{
if($this->updateSoftwareArchive($entry)!=200) $ok = false;
} else {
if(!$this->yellow->toolbox->deleteFile($entry)) $ok = false;
}
}
if($ok)
{
foreach($this->yellow->toolbox->getDirectoryEntries($path, $regex, true, false) as $entry)
{
$this->yellow->toolbox->deleteFile($entry);
}
}
return $ok;
@ -411,9 +416,9 @@ class YellowUpdate
$regex = "/^.*\\".$this->yellow->config->get("downloadExtension")."$/";
foreach($this->yellow->toolbox->getDirectoryEntries($path, $regex, true, false, false) as $entry)
{
if(preg_match("/^installation-(.*?)\\./", $entry, $matches))
if(preg_match("/^(.*?)-(.*?)\./", $entry, $matches))
{
array_push($data, $matches[1]);
array_push($data, $matches[2]);
}
}
return $data;