only delete concrete directory

flux-eco · Apr 1, 2022 · 908f135 · 908f135
1 parent cc12c5f
commit 908f135
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # CHANGELOG
 
+## [1.0.7]
+- fix: git - only delete concrete directory 
+
 ## [1.0.6]
-- fix: git - commands
+- fix: git - commands`
 
 ## [1.0.5]
 - fix: git - delete directory if exists

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "flux-eco/source-downloader",
   "description": "Component for flux-capacitor apps developed by fluxlabs",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "flux-eco",
   "keywords": [
     "flux-eco",

diff --git a/src/Core/Application/DownloadHandlers/GitCloneCommandHandler.php b/src/Core/Application/DownloadHandlers/GitCloneCommandHandler.php
@@ -33,8 +33,8 @@ public function handle(Command $command) : void
         }
 
         $createDirectory = 'mkdir -p ' . $command->getDirectoryPath();
-        if(is_dir($command->getDirectoryPath())) {
-            $createDirectory = 'rm -r ' . $command->getDirectoryPath().' && '.$createDirectory;
+        if(is_dir($command->getDirectoryPath()).'/'.$command->getDirectoryName()) {
+            $createDirectory = 'rm -r ' . $command->getDirectoryPath().'/'.$command->getDirectoryName().' && '.$createDirectory;
         }
         $cdDirectory = 'cd ' . $command->getDirectoryPath();
         $cloneRepository = 'git clone --branch ' . $command->getTag() . ' ' . $command->getUrl() . ' ' . $command->getDirectoryName();

diff --git a/src/Core/Application/DownloadHandlers/GitCloneStateCommandHandler.php b/src/Core/Application/DownloadHandlers/GitCloneStateCommandHandler.php
@@ -33,8 +33,8 @@ public function handle(Command $command) : void
         }
 
         $createDirectory = 'mkdir -p ' . $command->getDirectoryPath();
-        if(is_dir($command->getDirectoryPath())) {
-            $createDirectory = 'rm -r ' . $command->getDirectoryPath().' && '.$createDirectory;
+        if(is_dir($command->getDirectoryPath()).'/'.$command->getDirectoryName()) {
+            $createDirectory = 'rm -r ' . $command->getDirectoryPath().'/'.$command->getDirectoryName().' && '.$createDirectory;
         }
         $cdDirectory = 'cd ' . $command->getDirectoryPath();
         $cloneRepository = 'git clone --depth 1 --branch '.$command->getTag() .' '. $command->getUrl().' '.$command->getDirectoryName();