From fe721bd833ae89a10a0eaa4ae9a2ac01d977558e Mon Sep 17 00:00:00 2001 From: printempw Date: Sat, 5 Aug 2017 16:00:14 +0800 Subject: [PATCH] Skip copying vendor if error occurred when upgrading --- app/Http/Controllers/UpdateController.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php index a415cef6..39595e60 100644 --- a/app/Http/Controllers/UpdateController.php +++ b/app/Http/Controllers/UpdateController.php @@ -177,6 +177,15 @@ class UpdateController extends Controller } $zip->close(); + try { + File::copyDirectory("$extract_dir/vendor", base_path('vendor')); + } catch (\Exception $e) { + Log::error('[Extracter] Unable to extract vendors', [$e]); + // Skip copying vendor + File::deleteDirectory("$extract_dir/vendor"); + } + + try { File::copyDirectory($extract_dir, base_path());