From 925deed5d525ca334e2aeaee3aac3be8c5532e93 Mon Sep 17 00:00:00 2001
From: Tsukasa Kanzaki <tsukasa.kzk@gmail.com>
Date: Wed, 17 Jul 2019 06:56:31 +0000
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=85=88=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AC=E5=9C=B0=E6=9C=8D=E5=8A=A1=E5=99=A8,=20?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=93=8D=E4=BD=9C=E4=BB=85=E5=AF=B9=20storag?=
 =?UTF-8?q?e=20=E7=9B=AE=E5=BD=95=E5=8F=98=E6=9B=B4=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Envoy.blade.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Envoy.blade.php b/Envoy.blade.php
index 8a18c90..9e997f4 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -41,22 +41,24 @@
         $remote_storage_dir = $remote_dir . '/storage';
         $remote_public_vendor_dir = $remote_dir . '/vendor';
         $remote_new_release_dir = $remote_releases_dir .'/'. $release_no;
+        $remote_tmp = '/tmp/' . $release_no;
     }
 
 @endsetup
 
 @story('deploy')
     clone_repository
+    run_composer
+    update_symlinks
+    change_owner
     @if($remote)
         ssh_create_release_dir
         ssh_copy_to_remote
         run_composer_on_remote
         update_symlinks_on_remote
         change_owner_on_remote
+        clear_temp_file
     @endif
-    run_composer
-    update_symlinks
-    change_owner
 @endstory
 
 @task('clone_repository', ['on' => 'localhost'])
@@ -88,6 +90,10 @@
     cd {{ $new_release_dir }}
     rm -rf .git
 
+    @if($remote)
+        cp -r {{ $new_release_dir }} {{ $remote_tmp }}
+    @endif
+
 @endtask
 
 @task('run_composer', ['on' => 'localhost'])
@@ -144,7 +150,7 @@
 
 @task('ssh_copy_to_remote', ['on' => 'localhost'])
     echo 'Copy code file to remote via ssh'
-    scp -BCqr {{ $new_release_dir }} {{ $remote }}:{{ $remote_releases_dir }}
+    scp -BCqr {{ $remote_tmp }} {{ $remote }}:{{ $remote_releases_dir }}
 @endtask
 
 @task('run_composer_on_remote', ['on' => 'remote'])
@@ -186,8 +192,12 @@
 @endtask
 
 @task('change_owner_on_remote', ['on' => 'remote'])
-    chown -R {{ $remote_app_user }} {{ $remote_dir }}
-    chown -R {{ $remote_app_user }} {{ $remote_releases_dir }}
+    {{-- chown -R {{ $remote_app_user }} {{ $remote_dir }} --}}
+    {{-- chown -R {{ $remote_app_user }} {{ $remote_releases_dir }} --}}
     chown -R {{ $remote_app_user }} {{ $remote_storage_dir }}
-    chown -R {{ $remote_app_user }} {{ $remote_new_release_dir }}
+    {{-- chown -R {{ $remote_app_user }} {{ $remote_new_release_dir }} --}}
+@endtask
+
+@task('clear_temp_file')
+    rm -rf {{ $remote_tmp }}
 @endtask
\ No newline at end of file