Fixed git subdirs removal.

drevops · Sep 20, 2017 · 7fada89 · 7fada89
1 parent 9112acb
commit 7fada89
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/ArtefactTrait.php b/src/ArtefactTrait.php
@@ -261,12 +261,15 @@ protected function replaceGitignore($filename, $path)
      */
     protected function removeSubRepos($path)
     {
-        $dirs = glob($path.DIRECTORY_SEPARATOR.'.git', GLOB_ONLYDIR);
-        if (!empty($dirs)) {
-            // Make sure that current repo's .git dir is not removed.
-            $dirs = array_diff($dirs, [$path.DIRECTORY_SEPARATOR.'.git']);
-            $this->fsFileSystem->remove($dirs);
-        }
+        $dirs = $this->fsFinder
+            ->in($path)
+            ->name('/\.git$/')
+            ->ignoreDotFiles(false)
+            ->ignoreVCS(false)
+            ->notPath('vendor')
+            ->depth('>1');
+
+        $this->fsFileSystem->remove($dirs);
     }
 
     /**