kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed pre requisite checker paths (fixes #748)

Browse Source
This commit is contained in:
Bernd Bestel 2020-04-17 19:57:22 +02:00
parent b4a480aa37
commit 356cdf4991
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app.php
View File

@ -8,19 +8,6 @@ use Slim\Factory\AppFactory;
use Grocy\Helpers\UrlManager; use Grocy\Helpers\UrlManager;
use Grocy\Controllers\LoginController; use Grocy\Controllers\LoginController;
// Definitions for embedded mode
if (file_exists(__DIR__ . '/embedded.txt'))
{
define('GROCY_IS_EMBEDDED_INSTALL', true);
define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
define('GROCY_USER_ID', 1);
}
else
{
define('GROCY_IS_EMBEDDED_INSTALL', false);
define('GROCY_DATAPATH', __DIR__ . '/data');
}
// Load composer dependencies // Load composer dependencies
require_once __DIR__ . '/vendor/autoload.php'; require_once __DIR__ . '/vendor/autoload.php';
@ -29,7 +16,7 @@ require_once GROCY_DATAPATH . '/config.php';
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
// Definitions for dev/demo/prerelease mode // Definitions for dev/demo/prerelease mode
if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease') if ((GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease') && !defined('GROCY_USER_ID'))
{ {
define('GROCY_USER_ID', 1); define('GROCY_USER_ID', 1);
} }

4
helpers/PrerequisiteChecker.php
View File

@ -17,9 +17,9 @@ class PrerequisiteChecker
private function checkForConfigFile() private function checkForConfigFile()
{ {
if (!file_exists(__DIR__ . '/../data/config.php')) if (!file_exists(GROCY_DATAPATH . '/config.php'))
{ {
throw new ERequirementNotMet('/data/config.php not found. Have you copied config-dist.php to the data directory and renamed it to config.php?'); throw new ERequirementNotMet('config.php in data directory (' . GROCY_DATAPATH . ') not found. Have you copied config-dist.php to the data directory and renamed it to config.php?');
} }
} }

13
public/index.php
View File

@ -1,5 +1,18 @@
<?php <?php
// Definitions for embedded mode
if (file_exists(__DIR__ . '/../embedded.txt'))
{
define('GROCY_IS_EMBEDDED_INSTALL', true);
define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/../embedded.txt'));
define('GROCY_USER_ID', 1);
}
else
{
define('GROCY_IS_EMBEDDED_INSTALL', false);
define('GROCY_DATAPATH', __DIR__ . '/../data');
}
require_once __DIR__ . '/../helpers/PrerequisiteChecker.php'; require_once __DIR__ . '/../helpers/PrerequisiteChecker.php';
try try