Merge branch 'v1.0.3' into 'main'

fix delete directory if exists See merge request fluxlabs/flux-eco/source-downloader!6
flux-eco · Apr 1, 2022 · 80084bd · 80084bd
2 parents afd3071 + 3ac5464
commit 80084bd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [1.0.5]
+- fix: git - delete directory if exists
+
 ## [1.0.4]
 - updated dependencies
 

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.4",
+  "version": "1.0.5",
   "type": "flux-eco",
   "keywords": [
     "flux-eco",

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