wip #5817 @0.25

diff --git a/src/CommandLine/Inkscape.php b/src/CommandLine/Inkscape.php
deleted file mode 100644 (file)
index dd926fc..0000000
--- a/src/CommandLine/Inkscape.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Cubist\Util\CommandLine;
-
-use Cubist\Util\CommandLine;
-
-class Inkscape extends CommandLine
-{
-
-    public function __construct($output = null, $error = true)
-    {
-        parent::__construct('inkscape', $output, $error);
-    }
-
-    public function openFileAndApplyVerbs($file, $verbs = [])
-    {
-        $this->setArg('f', $file);
-        foreach ($verbs as $verb) {
-            $this->setArg('verb', $verb);
-        }
-    }
-
-    public function strokeToPath($file)
-    {
-        $this->openFileAndApplyVerbs($file, ['EditSelectAll', 'StrokeToPath', 'FileSave', 'FileQuit']);
-    }
-}
\ No newline at end of file

diff --git a/src/Zip.php b/src/Zip.php
index 85aee80d320b846a750ec9bee6a6269e6dfda66b..259715bbb686c9ab5a039d15aa4992bba86676c6 100644 (file)
--- a/src/Zip.php
+++ b/src/Zip.php
@@ -23,9 +23,9 @@ class Zip
             $cl->setArg('j');
         }
         $cl->setArg(null, $zip);
+        $cl->setArg('x', '"__MACOSX/*"');
         $cl->execute();
 
-
         if (stristr($cl->getOutput(), 'zipfile corrupt')) {
             $corrupted = $zip . '.corrupted';
             rename($zip, $corrupted);