ARCHBLOX
/
website
1
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

git pull fix (hopefully)

This commit is contained in:
Conkley 2022-07-25 16:24:28 +10:00
parent 60d51d98ab
commit c8612a0fd2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Console/Commands/RefreshApp.php
View File

@ -109,10 +109,15 @@ class RefreshApp extends Command
private function runPull() private function runPull()
{ {
chdir("/var/www/MORBLOX-WEBSITE/morblox-site");
$process = new Process(['git pull']); $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'"); $this->info("Running 'git pull'");
$exception->run(function($type, $buffer) {
$this->pullLog[] = $buffer;
});
$process->run(function($type, $buffer) { $process->run(function($type, $buffer) {
$this->pullLog[] = $buffer; $this->pullLog[] = $buffer;

1
composer.json
View File

@ -13,6 +13,7 @@
"laravel/tinker": "^2.5", "laravel/tinker": "^2.5",
"laravel/ui": "^3.4", "laravel/ui": "^3.4",
"multicaret/laravel-acquaintances": "^3.5", "multicaret/laravel-acquaintances": "^3.5",
"symfony/process": "^5.4",
"webpatser/laravel-uuid": "^4.0" "webpatser/laravel-uuid": "^4.0"
}, },
"require-dev": { "require-dev": {

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5b427c2301ce3db3e2dbf83c41ddf6ed", "content-hash": "e197d3176b112e2dd2d96af84c934b22",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",