Merge branch 'fix/json-library-compatibility'

This commit is contained in:
michael 2025-09-05 17:44:42 +02:00
commit bf41726613
4 changed files with 14 additions and 5 deletions

View file

@ -17,3 +17,4 @@
25a29c32,38a1108,main,2025-09-03T20:13:08Z,michael,git,lua-api 25a29c32,38a1108,main,2025-09-03T20:13:08Z,michael,git,lua-api
25a29c32,442b465,fix/systemd-type-forking,2025-09-05T15:02:31Z,michael,git,lua-api 25a29c32,442b465,fix/systemd-type-forking,2025-09-05T15:02:31Z,michael,git,lua-api
25a29c32,c15b01a,fix/config-path-consistency,2025-09-05T15:21:25Z,michael,git,lua-api 25a29c32,c15b01a,fix/config-path-consistency,2025-09-05T15:21:25Z,michael,git,lua-api
795f8867,78e8ded,fix/json-library-compatibility,2025-09-05T15:44:42Z,michael,git,lua-api

View file

@ -59,10 +59,12 @@ $LUA_COMMAND -e "require('socket')" 2>/dev/null || {
exit 1 exit 1
} }
$LUA_COMMAND -e "require('cjson')" 2>/dev/null || { # JSON library check (cjson preferred, dkjson fallback)
echo -e "${RED}Error: lua-cjson not found${NC}" if ! ($LUA_COMMAND -e "require('cjson')" 2>/dev/null || $LUA_COMMAND -e "require('dkjson')" 2>/dev/null); then
echo -e "${RED}Error: No JSON library found${NC}"
echo "Install lua-cjson or lua-dkjson"
exit 1 exit 1
} fi
cd "$PROJECT_DIR" cd "$PROJECT_DIR"

View file

@ -3,7 +3,10 @@
-- Dragons@Work Digital Sovereignty Project -- Dragons@Work Digital Sovereignty Project
local socket = require("socket") local socket = require("socket")
local cjson = require("cjson") local found_cjson, cjson = pcall(require, 'cjson')
if not found_cjson then
cjson = require('dkjson')
end
-- Load modules -- Load modules
local Auth = require("src.auth") local Auth = require("src.auth")

View file

@ -3,7 +3,10 @@
-- API-Key determines mail configuration and recipient -- API-Key determines mail configuration and recipient
-- Dragons@Work Digital Sovereignty Project -- Dragons@Work Digital Sovereignty Project
local cjson = require("cjson") local found_cjson, cjson = pcall(require, 'cjson')
if not found_cjson then
cjson = require('dkjson')
end
local MailRoute = {} local MailRoute = {}