git pull fix (hopefully)
This commit is contained in:
parent
60d51d98ab
commit
c8612a0fd2
|
|
@ -109,10 +109,15 @@ class RefreshApp extends Command
|
|||
|
||||
private function runPull()
|
||||
{
|
||||
|
||||
$process = new Process(['git pull']);
|
||||
chdir("/var/www/MORBLOX-WEBSITE/morblox-site");
|
||||
$exception = new Process(['/usr/bin/git', 'config', '--global', '--add', 'safe.directory', '/var/www/MORBLOX-WEBSITE/morblox-site']);
|
||||
$process = new Process(['/usr/bin/git', 'pull']);
|
||||
$this->info("Running 'git pull'");
|
||||
|
||||
$exception->run(function($type, $buffer) {
|
||||
$this->pullLog[] = $buffer;
|
||||
});
|
||||
|
||||
$process->run(function($type, $buffer) {
|
||||
$this->pullLog[] = $buffer;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
"laravel/tinker": "^2.5",
|
||||
"laravel/ui": "^3.4",
|
||||
"multicaret/laravel-acquaintances": "^3.5",
|
||||
"symfony/process": "^5.4",
|
||||
"webpatser/laravel-uuid": "^4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "5b427c2301ce3db3e2dbf83c41ddf6ed",
|
||||
"content-hash": "e197d3176b112e2dd2d96af84c934b22",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asm89/stack-cors",
|
||||
|
|
|
|||
Loading…
Reference in New Issue