diff --git a/src/base.ts b/src/base.ts index cae0105a..df445f2d 100644 --- a/src/base.ts +++ b/src/base.ts @@ -3,35 +3,35 @@ import * as fs from "fs"; import {flockSync} from "fs-ext"; const HomeVarName = "HOME"; -const ScHomeVarName = "SCRIPTHAUS_HOME"; -const SCLockFile = "sh2-electron.lock"; -const DBFileName = "sh2.db"; +const PromptHomeVarName = "PROMPT_HOME"; +const PromptLockFile = "prompt-electron.lock"; +const DBFileName = "prompt.db"; const SessionsDirBaseName = "sessions"; const RemotesDirBaseName = "remotes"; -const ScDirName = "scripthaus"; +const PromptDirName = "prompt"; -function getScHomeDir() : string { - if (process.env[ScHomeVarName]) { - return process.env[ScHomeVarName]; +function getPromptHomeDir() : string { + if (process.env[PromptHomeVarName]) { + return process.env[PromptHomeVarName]; } let homeDir = process.env[HomeVarName]; if (!homeDir) { homeDir = "/"; } - return path.join(homeDir, ScDirName); + return path.join(homeDir, PromptDirName); } function getDBName() : string { - let scHome = getScHomeDir(); - return path.join(scHome, DBFileName); + let promptHome = getPromptHomeDir(); + return path.join(promptHome, DBFileName); } -function acquireSCElectronLock() : File { - let scHome = getScHomeDir(); - let lockFileName = path.join(scHome, SCLockFile); +function acquirePromptElectronLock() : File { + let promptHome = getPromptHomeDir(); + let lockFileName = path.join(promptHome, PromptLockFile); let fd = fs.openSync(lockFileName, "w", 0o600); flockSync(fd, "exnb"); return fd; } -export {getScHomeDir, getDBName, acquireSCElectronLock}; +export {getPromptHomeDir, getDBName, acquirePromptElectronLock}; diff --git a/src/emain.ts b/src/emain.ts index bb643645..81648c9f 100644 --- a/src/emain.ts +++ b/src/emain.ts @@ -4,7 +4,7 @@ import * as fs from "fs"; import fetch from "node-fetch"; import * as child_process from "node:child_process"; import {debounce} from "throttle-debounce"; -import {acquireSCElectronLock} from "./base"; +import {acquirePromptElectronLock} from "./base"; import {handleJsonFetchResponse} from "./util"; import * as winston from "winston"; import * as util from "util"; @@ -44,6 +44,9 @@ function log(...msg) { } console.log = log; console.log(sprintf("prompt-app starting, PROMPT_HOME=%s, apppath=%s arch=%s/%s", scHome, getAppBasePath(), unamePlatform, unameArch)); +if (isDev) { + console.log("prompt-app PROMPT_DEV set"); +} const DevLocalServerPath = "/Users/mike/prompt/local-server"; let localServerProc = null; @@ -96,7 +99,7 @@ app.setName("Prompt"); let lock : File; try { - lock = acquireSCElectronLock(); + lock = acquirePromptElectronLock(); } catch (e) { app.exit(0);