uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
76
pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
Normal file
76
pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
From 035709eeac697945a26276cc17b996c1a0678ddc Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Tue, 22 Dec 2020 15:38:56 +0100
|
||||
Subject: [PATCH] Define configs with env vars
|
||||
|
||||
---
|
||||
app.php | 4 ++--
|
||||
services/DatabaseService.php | 2 +-
|
||||
services/FilesService.php | 2 +-
|
||||
services/StockService.php | 3 +--
|
||||
4 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/app.php b/app.php
|
||||
index 17ba6a99..89f48089 100644
|
||||
--- a/app.php
|
||||
+++ b/app.php
|
||||
@@ -11,7 +11,7 @@ use Slim\Views\Blade;
|
||||
require_once __DIR__ . '/vendor/autoload.php';
|
||||
|
||||
// Load config files
|
||||
-require_once GROCY_DATAPATH . '/config.php';
|
||||
+require_once getenv('GROCY_CONFIG_FILE');
|
||||
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
|
||||
require_once __DIR__ . '/helpers/ConfigurationValidator.php';
|
||||
|
||||
@@ -62,7 +62,7 @@ $app = AppFactory::create();
|
||||
|
||||
$container = $app->getContainer();
|
||||
$container->set('view', function (Container $container) {
|
||||
- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
|
||||
+ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
|
||||
});
|
||||
|
||||
$container->set('UrlManager', function (Container $container) {
|
||||
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
|
||||
index dfcd5d4b..bc8d1a1d 100644
|
||||
--- a/services/DatabaseService.php
|
||||
+++ b/services/DatabaseService.php
|
||||
@@ -107,6 +107,6 @@ class DatabaseService
|
||||
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
|
||||
}
|
||||
|
||||
- return GROCY_DATAPATH . '/grocy.db';
|
||||
+ return getenv('GROCY_DB_FILE');
|
||||
}
|
||||
}
|
||||
diff --git a/services/FilesService.php b/services/FilesService.php
|
||||
index 7d070350..fba2e923 100644
|
||||
--- a/services/FilesService.php
|
||||
+++ b/services/FilesService.php
|
||||
@@ -103,7 +103,7 @@ class FilesService extends BaseService
|
||||
|
||||
public function GetFilePath($group, $fileName)
|
||||
{
|
||||
- $groupFolderPath = $this->StoragePath . '/' . $group;
|
||||
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
|
||||
|
||||
if (!file_exists($groupFolderPath))
|
||||
{
|
||||
diff --git a/services/StockService.php b/services/StockService.php
|
||||
index f73ac5bd..6b6e693a 100644
|
||||
--- a/services/StockService.php
|
||||
+++ b/services/StockService.php
|
||||
@@ -1589,8 +1589,7 @@ class StockService extends BaseService
|
||||
throw new \Exception('No barcode lookup plugin defined');
|
||||
}
|
||||
|
||||
- $path = GROCY_DATAPATH . "/plugins/$pluginName.php";
|
||||
-
|
||||
+ $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
|
||||
if (file_exists($path))
|
||||
{
|
||||
require_once $path;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue