mikuli.cz

commit 42e9e9632169efbdc4ea6abfc9fa2a519f1c7f6d
parent 853b17f1de778cf38d9341340bbc28a4835bf831
Author: markseu <mark2011@mayberg.se>
Date:   Sat, 30 Jul 2016 02:58:14 +0200

System update (better installation)

Diffstat:
R
system/plugins/installation-blog.zip.download -> system/plugins/update-blog.zip.download
 | 
0

R
system/plugins/installation-wiki.zip.download -> system/plugins/update-wiki.zip.download
 | 
0

M
system/plugins/update.php
 | 
13
+++++++++----

3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/system/plugins/installation-blog.zip.download b/system/plugins/update-blog.zip.download
Binary files differ.
diff --git a/system/plugins/installation-wiki.zip.download b/system/plugins/update-wiki.zip.download
Binary files differ.
diff --git a/system/plugins/update.php b/system/plugins/update.php
@@ -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;