From 2ba213de49386d2ea3954d5e1a56202b66153fd0 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 7 Jan 2026 20:50:51 +0100
Subject: [PATCH] fix: pct create fails with malformed arguments (#423) (#427)

- Fix NS/MTU/MAC/VLAN/SD variables missing proper prefixes in base_settings()
  Variables were passed as raw values instead of formatted pct options
  (e.g., '192.168.1.1' instead of '-nameserver=192.168.1.1')

- Strip spaces from nameserver values to prevent 'too many arguments' error
  Multiple DNS servers must be comma-separated without spaces

- Auto-create database directory before Prisma initialization
  Fixes 'Cannot open database because directory does not exist' error
  for manual Git installations
---
 scripts/core/build.func | 20 +++++++++++++-------
 src/server/db.js        | 13 +++++++++++++
 src/server/db.ts        | 13 +++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/scripts/core/build.func b/scripts/core/build.func
index 67d02b1..356b19a 100755
--- a/scripts/core/build.func
+++ b/scripts/core/build.func
@@ -517,11 +517,16 @@ base_settings() {
     fi
   fi
 
-  MTU=${var_mtu:-""}
-  SD=${var_storage:-""}
-  NS=${var_ns:-""}
-  MAC=${var_mac:-""}
-  VLAN=${var_vlan:-""}
+  # Format optional network variables with proper prefixes for pct create
+  # Also strip any spaces from nameserver values (multiple IPs must be comma-separated without spaces)
+  local _ns_clean="${var_ns:-}"
+  _ns_clean="${_ns_clean// /}" # Remove all spaces from nameserver value
+
+  [[ -n "${var_mtu:-}" ]] && MTU=",mtu=${var_mtu}" || MTU=""
+  [[ -n "${var_searchdomain:-}" ]] && SD="-searchdomain=${var_searchdomain}" || SD=""
+  [[ -n "$_ns_clean" ]] && NS="-nameserver=${_ns_clean}" || NS=""
+  [[ -n "${var_mac:-}" ]] && MAC=",hwaddr=${var_mac}" || MAC=""
+  [[ -n "${var_vlan:-}" ]] && VLAN=",tag=${var_vlan}" || VLAN=""
   SSH=${var_ssh:-"no"}
   SSH_AUTHORIZED_KEY=${var_ssh_authorized_key:-""}
   UDHCPC_FIX=${var_udhcpc_fix:-""}
@@ -2023,10 +2028,11 @@ Advanced:
   var_apt_cacher="$_apt_cacher"
   var_apt_cacher_ip="$_apt_cacher_ip"
 
-  # Format optional values
+  # Format optional values (strip spaces from nameserver - multiple IPs must be comma-separated without spaces)
+  local _ns_clean="${_ns// /}"
   [[ -n "$_mtu" ]] && MTU=",mtu=$_mtu" || MTU=""
   [[ -n "$_sd" ]] && SD="-searchdomain=$_sd" || SD=""
-  [[ -n "$_ns" ]] && NS="-nameserver=$_ns" || NS=""
+  [[ -n "$_ns_clean" ]] && NS="-nameserver=$_ns_clean" || NS=""
   [[ -n "$_mac" ]] && MAC=",hwaddr=$_mac" || MAC=""
   [[ -n "$_vlan" ]] && VLAN=",tag=$_vlan" || VLAN=""
 
diff --git a/src/server/db.js b/src/server/db.js
index 6b1bcba..b074b2e 100644
--- a/src/server/db.js
+++ b/src/server/db.js
@@ -1,9 +1,22 @@
 import 'dotenv/config'
 import { PrismaClient } from '../../prisma/generated/prisma/client.ts'
 import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3'
+import { existsSync, mkdirSync } from 'fs'
+import { dirname } from 'path'
 
 const globalForPrisma = globalThis;
 
+// Ensure database directory exists before initializing Prisma
+// DATABASE_URL format: file:/path/to/database.db
+const dbUrl = process.env.DATABASE_URL || 'file:./data/settings.db';
+const dbPath = dbUrl.replace(/^file:/, '');
+const dbDir = dirname(dbPath);
+
+if (!existsSync(dbDir)) {
+  console.log(`Creating database directory: ${dbDir}`);
+  mkdirSync(dbDir, { recursive: true });
+}
+
 const adapter = new PrismaBetterSqlite3({ url: process.env.DATABASE_URL });
 
 export const prisma = globalForPrisma.prisma ?? new PrismaClient({ adapter });
diff --git a/src/server/db.ts b/src/server/db.ts
index fdfe10f..1725460 100644
--- a/src/server/db.ts
+++ b/src/server/db.ts
@@ -1,9 +1,22 @@
 import 'dotenv/config'
 import { PrismaClient } from '../../prisma/generated/prisma/client'
 import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3'
+import { existsSync, mkdirSync } from 'fs'
+import { dirname } from 'path'
 
 const globalForPrisma = globalThis as { prisma?: PrismaClient };
 
+// Ensure database directory exists before initializing Prisma
+// DATABASE_URL format: file:/path/to/database.db
+const dbUrl = process.env.DATABASE_URL || 'file:./data/settings.db';
+const dbPath = dbUrl.replace(/^file:/, '');
+const dbDir = dirname(dbPath);
+
+if (!existsSync(dbDir)) {
+  console.log(`Creating database directory: ${dbDir}`);
+  mkdirSync(dbDir, { recursive: true });
+}
+
 const adapter = new PrismaBetterSqlite3({ url: process.env.DATABASE_URL! });
 
 export const prisma: PrismaClient = globalForPrisma.prisma ?? new PrismaClient({