mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-05 21:10:21 +00:00
refactor!: drop legacy CLAWDBOT env compatibility
This commit is contained in:
@@ -62,7 +62,7 @@ export function resolveStateDir(
|
||||
homedir: () => string = envHomedir(env),
|
||||
): string {
|
||||
const effectiveHomedir = () => resolveRequiredHomeDir(env, homedir);
|
||||
const override = env.OPENCLAW_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim();
|
||||
const override = env.OPENCLAW_STATE_DIR?.trim();
|
||||
if (override) {
|
||||
return resolveUserPath(override, env, effectiveHomedir);
|
||||
}
|
||||
@@ -107,7 +107,7 @@ export function resolveCanonicalConfigPath(
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
stateDir: string = resolveStateDir(env, envHomedir(env)),
|
||||
): string {
|
||||
const override = env.OPENCLAW_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim();
|
||||
const override = env.OPENCLAW_CONFIG_PATH?.trim();
|
||||
if (override) {
|
||||
return resolveUserPath(override, env, envHomedir(env));
|
||||
}
|
||||
@@ -190,13 +190,13 @@ export function resolveDefaultConfigCandidates(
|
||||
homedir: () => string = envHomedir(env),
|
||||
): string[] {
|
||||
const effectiveHomedir = () => resolveRequiredHomeDir(env, homedir);
|
||||
const explicit = env.OPENCLAW_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim();
|
||||
const explicit = env.OPENCLAW_CONFIG_PATH?.trim();
|
||||
if (explicit) {
|
||||
return [resolveUserPath(explicit, env, effectiveHomedir)];
|
||||
}
|
||||
|
||||
const candidates: string[] = [];
|
||||
const openclawStateDir = env.OPENCLAW_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim();
|
||||
const openclawStateDir = env.OPENCLAW_STATE_DIR?.trim();
|
||||
if (openclawStateDir) {
|
||||
const resolved = resolveUserPath(openclawStateDir, env, effectiveHomedir);
|
||||
candidates.push(path.join(resolved, CONFIG_FILENAME));
|
||||
@@ -255,7 +255,7 @@ export function resolveGatewayPort(
|
||||
cfg?: OpenClawConfig,
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
): number {
|
||||
const envRaw = env.OPENCLAW_GATEWAY_PORT?.trim() || env.CLAWDBOT_GATEWAY_PORT?.trim();
|
||||
const envRaw = env.OPENCLAW_GATEWAY_PORT?.trim();
|
||||
if (envRaw) {
|
||||
const parsed = Number.parseInt(envRaw, 10);
|
||||
if (Number.isFinite(parsed) && parsed > 0) {
|
||||
|
||||
Reference in New Issue
Block a user