From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 20 Jun 2012 14:33:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=208bc172b818d83653f355f5f2dee5ce9ea06d44;p=cubeextranet.git

---

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
index b26f7c807..0dbe800ad 100644
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
@@ -20,7 +20,7 @@ class wsPackagerMacEXE extends wsPackager {
 
 	public function makePackage($zip)
 	{
-		parent::makePackage();
+		parent::makePackage($zip);
 		$res=$this->zip($this->vdir . 'Fluidbook.app.zip');
 		$this->postPackage();
 		return $res;
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 6985de8b4..d166ac2d3 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -156,15 +156,12 @@ class wsPackager {
 			$rename = true;
 		}
 
-		if (file_exists($zipfile)) {
-			unlink($zipfile);
-		}
-
 		$zip = new cubeCommandLine('zip');
 		$zip->cd($this->vdir);
 		$zip->setArg(null, $zipfile);
 		$zip->setArg('0');
 		$zip->setArg('r');
+		$zip->setArg('u');
 		$zip->setArg(null, '.');
 		$zip->execute();