kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Update installation commands.

Browse Source
This commit is contained in:
James Cole
2021-03-12 06:30:40 +01:00
parent 748d61fb8f
commit a05d006fa7
40 changed files with 1624 additions and 1470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/System/InstallController.php
View File

@@ -83,6 +83,7 @@ class InstallController extends Controller
'firefly-iii:rename-account-meta' => [],
'firefly-iii:migrate-recurrence-meta' => [],
'firefly-iii:migrate-tag-locations' => [],
'firefly-iii:migrate-recurrence-type' => [],
// verify commands
'firefly-iii:fix-piggies' => [],
@@ -120,10 +121,10 @@ class InstallController extends Controller
public function index()
{
// index will set FF3 version.
app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
app('fireflyconfig')->set('ff3_version', (string)config('firefly.version'));
// set new DB version.
app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
app('fireflyconfig')->set('db_version', (int)config('firefly.db_version'));
return prefixView('install.index');
}
@@ -156,7 +157,7 @@ class InstallController extends Controller
*/
public function runCommand(Request $request): JsonResponse
{
$requestIndex = (int) $request->get('index');
$requestIndex = (int)$request->get('index');
$response = [
'hasNextCommand' => false,
'done' => true,
@@ -183,6 +184,7 @@ class InstallController extends Controller
if (false === $result) {
$response['errorMessage'] = $this->lastError;
$response['error'] = true;
return response()->json($response);
}
$index++;
@@ -197,6 +199,7 @@ class InstallController extends Controller
/**
* @param string $command
* @param array $args
*
* @return bool
*/
private function executeCommand(string $command, array $args): bool
@@ -215,15 +218,17 @@ class InstallController extends Controller
Log::error($e->getTraceAsString());
if (strpos($e->getMessage(), 'open_basedir restriction in effect')) {
$this->lastError = self::BASEDIR_ERROR;
return false;
}
$this->lastError = sprintf('%s %s', self::OTHER_ERROR, $e->getMessage());
return false;
}
// clear cache as well.
Cache::clear();
Preferences::mark();
return true;
}
}