🚑 Use firstdeploy:shared after deploy:shared

lorisleiva · lorisleiva · commit 02fa9ad54436 · 2018-03-14T03:00:05.000+01:00
diff --git a/docs/deploy-task.md b/docs/deploy-task.md
@@ -9,8 +9,8 @@ The following table describes the default deployment tasks in their execution or
 | `deploy:lock` | Lock the host to ensure we won't try to redeploy before its done. |
 | `deploy:release` | Clean up unfinished releases and prepare next release. |
 | `deploy:update_code` | Update code by running `git clone` on the new release folder. |
-| `firstdeploy:shared` | It will try to copy the shared files directly from the `{{deploy_path}}` if not available on the `{{release_path}}`. This ensures we do not lose shared files or directories that are git-ignored when deploying for the first time on a live server. [Read more here](first-deploy.md). |
 | `deploy:shared` | Creating symlinks for shared files and directories. If shared files or directories are not present in the `shared` folder, it will try to resolve then from the `{{release_path}}`. |
+| `firstdeploy:shared` | It will try to copy the shared files directly from the `{{deploy_path}}` if not already on the shared folder. This ensures we do not lose shared files or directories that are git-ignored when deploying for the first time on a live server. [Read more here](first-deploy.md). |
 | `deploy:vendors` | Installing vendors. Basically running `composer install`. |
 | `deploy:writable` | Make directories in `{{writable_dirs}}` writable. |
 | `artisan:storage:link` | Execute artisan `storage:link`. |
diff --git a/docs/first-deploy.md b/docs/first-deploy.md
@@ -15,7 +15,7 @@ Start by deploying using `php artisan deploy`. Unless you have some folders call
 > 
 > If some of your shared files or directories are included in your `.gitignore`, the native `deploy:shared` task will not be able to retrieve them from your repository. This is typically the case for our `.env` file and the `storage` folder. If you already have a `.env` file and a `storage` folder in your live deployment path, you might want to use them in your shared folder.
 > 
-> By default Laravel Deployer provides a `firstdeploy:shared` task (executed right before the `deploy:shared` task) that will copy any shared files and folders present in the `deploy_path` (but absent in the `release_path`) into the shared folder.
+> By default Laravel Deployer provides a `firstdeploy:shared` task (executed right after the `deploy:shared` task) that will copy any shared files and folders from the `deploy_path` into the shared folder (if not already in the shared folder).
 
 ## 2️⃣ Point root path to current directory
 Make sure your server's root path points to the `current` symlink. For example if your `deploy_path` is `var/www/domain.com`, your server configurations should point to `var/www/domain.com/current`.
diff --git a/src/recipe/laravel-deployer.php b/src/recipe/laravel-deployer.php
@@ -50,8 +50,8 @@
     'deploy:lock',
     'deploy:release',
     'deploy:update_code',
-    'firstdeploy:shared',
     'deploy:shared',
+    'firstdeploy:shared',
     'deploy:vendors',
     'deploy:writable',
     'artisan:storage:link',
diff --git a/src/task/firstdeploy.php b/src/task/firstdeploy.php
@@ -7,24 +7,16 @@
     $sharedPath = "{{deploy_path}}/shared";
 
     foreach (get('shared_dirs') as $dir) {
-        if (
-            ! test("[ -d $sharedPath/$dir ]") && 
-            ! test("[ -d {{release_path}}/$dir ]") && 
-            test("[ -d {{deploy_path}}/$dir ]")
-        ) {
+        if (test("[ -d {{deploy_path}}/$dir ]")) {
             run("mkdir -p $sharedPath/$dir");
-            run("cp -rv {{deploy_path}}/$dir $sharedPath/" . dirname(parse($dir)));
+            run("rsync -r --ignore-existing {{deploy_path}}/$dir $sharedPath/" . dirname(parse($dir)));
         }
     }
 
     foreach (get('shared_files') as $file) {
-        if (
-            ! test("[ -f $sharedPath/$file ]") && 
-            ! test("[ -f {{release_path}}/$file ]") && 
-            test("[ -f {{deploy_path}}/$file ]")
-        ) {
+        if (test("[ -f {{deploy_path}}/$file ]")) {
             run("mkdir -p $sharedPath/" . dirname(parse($file)));
-            run("cp -rv {{deploy_path}}/$file $sharedPath/$file");
+            run("rsync -r --ignore-existing {{deploy_path}}/$file $sharedPath/$file");
         }
     }
 });

Original file line number	Diff line number	Diff line change
@@ -15,7 +15,7 @@ Start by deploying using `php artisan deploy`. Unless you have some folders call
`15`	`15`	`>`
`16`	`16`	> If some of your shared files or directories are included in your `.gitignore`, the native `deploy:shared` task will not be able to retrieve them from your repository. This is typically the case for our `.env` file and the `storage` folder. If you already have a `.env` file and a `storage` folder in your live deployment path, you might want to use them in your shared folder.
`17`	`17`	`>`
`18`		-> By default Laravel Deployer provides a `firstdeploy:shared` task (executed right before the `deploy:shared` task) that will copy any shared files and folders present in the `deploy_path` (but absent in the `release_path`) into the shared folder.
	`18`	+> By default Laravel Deployer provides a `firstdeploy:shared` task (executed right after the `deploy:shared` task) that will copy any shared files and folders from the `deploy_path` into the shared folder (if not already in the shared folder).
`19`	`19`
`20`	`20`	`## 2️⃣ Point root path to current directory`
`21`	`21`	Make sure your server's root path points to the `current` symlink. For example if your `deploy_path` is `var/www/domain.com`, your server configurations should point to `var/www/domain.com/current`.