(no commit message)

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 b26f7c80765067f110effb7548187a5c10ff6a1a..0dbe800add343b01d5aa59aad0ffc19c2150690a 100644 (file)
--- 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 {
 \r
        public function makePackage($zip)\r
        {\r
-               parent::makePackage();\r
+               parent::makePackage($zip);\r
                $res=$this->zip($this->vdir . 'Fluidbook.app.zip');\r
                $this->postPackage();\r
                return $res;\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 6985de8b45f7348af48b2977131d9a9b1c39233f..d166ac2d3fc636fcbf6749e8ae7791e960d99f53 100644 (file)
--- 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;\r
                }\r
 \r
-               if (file_exists($zipfile)) {\r
-                       unlink($zipfile);\r
-               }\r
-\r
                $zip = new cubeCommandLine('zip');\r
                $zip->cd($this->vdir);\r
                $zip->setArg(null, $zipfile);\r
                $zip->setArg('0');\r
                $zip->setArg('r');\r
+               $zip->setArg('u');\r
                $zip->setArg(null, '.');\r
                $zip->execute();\r
 \r