From 7e19d1a9d2dc0d5db5f0015257554281b1e5be2e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 9 Apr 2021 08:03:34 +1000 Subject: [PATCH 1/4] v5.1.42 --- app/Http/Controllers/SelfUpdateController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 1d27e5d5d7..ffb28cd13e 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -16,7 +16,6 @@ use Cz\Git\GitException; use Cz\Git\GitRepository; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Artisan; -use Illuminate\Support\Facades\Artisan; class SelfUpdateController extends BaseController { From 5adc39b06cc3601e44a781927542e9e21b213acf Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 9 Apr 2021 08:11:17 +1000 Subject: [PATCH 2/4] minor fixes --- app/Http/Controllers/SelfUpdateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index ffb28cd13e..bda8a87ad3 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -83,7 +83,7 @@ class SelfUpdateController extends BaseController Artisan::call('config:clear'); $output = $repo->execute('stash'); - $output = $repo->execute('reset hard origin/v5-stable'); + $output = $repo->execute('reset --hard origin/v5-stable'); $output = $repo->execute('pull origin'); } catch (GitException $e) { From 37f662e2f3bdafb9733113b02af195aebfb3cc8a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 9 Apr 2021 08:16:43 +1000 Subject: [PATCH 3/4] remove duplicate artisan command --- app/Http/Controllers/SelfUpdateController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 1d27e5d5d7..ffb28cd13e 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -16,7 +16,6 @@ use Cz\Git\GitException; use Cz\Git\GitRepository; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Artisan; -use Illuminate\Support\Facades\Artisan; class SelfUpdateController extends BaseController { From 4b3fe82ba2ff87ad329f6ae8e01f8a8b36dbd62d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 9 Apr 2021 08:35:00 +1000 Subject: [PATCH 4/4] minor fixes --- app/Http/Controllers/SelfUpdateController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index bda8a87ad3..0f48d86bad 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -82,8 +82,8 @@ class SelfUpdateController extends BaseController Artisan::call('view:clear'); Artisan::call('config:clear'); - $output = $repo->execute('stash'); - $output = $repo->execute('reset --hard origin/v5-stable'); + // $output = $repo->execute('stash'); + // $output = $repo->execute('reset --hard origin/v5-stable'); $output = $repo->execute('pull origin'); } catch (GitException $e) {