more scripthaus -> prompt renaming

This commit is contained in:
sawka
2022-12-19 17:45:27 -08:00
parent 83166eb8f4
commit f0b9bc6eb8
2 changed files with 19 additions and 16 deletions
+14 -14
View File
@@ -3,35 +3,35 @@ import * as fs from "fs";
import {flockSync} from "fs-ext"; import {flockSync} from "fs-ext";
const HomeVarName = "HOME"; const HomeVarName = "HOME";
const ScHomeVarName = "SCRIPTHAUS_HOME"; const PromptHomeVarName = "PROMPT_HOME";
const SCLockFile = "sh2-electron.lock"; const PromptLockFile = "prompt-electron.lock";
const DBFileName = "sh2.db"; const DBFileName = "prompt.db";
const SessionsDirBaseName = "sessions"; const SessionsDirBaseName = "sessions";
const RemotesDirBaseName = "remotes"; const RemotesDirBaseName = "remotes";
const ScDirName = "scripthaus"; const PromptDirName = "prompt";
function getScHomeDir() : string { function getPromptHomeDir() : string {
if (process.env[ScHomeVarName]) { if (process.env[PromptHomeVarName]) {
return process.env[ScHomeVarName]; return process.env[PromptHomeVarName];
} }
let homeDir = process.env[HomeVarName]; let homeDir = process.env[HomeVarName];
if (!homeDir) { if (!homeDir) {
homeDir = "/"; homeDir = "/";
} }
return path.join(homeDir, ScDirName); return path.join(homeDir, PromptDirName);
} }
function getDBName() : string { function getDBName() : string {
let scHome = getScHomeDir(); let promptHome = getPromptHomeDir();
return path.join(scHome, DBFileName); return path.join(promptHome, DBFileName);
} }
function acquireSCElectronLock() : File { function acquirePromptElectronLock() : File {
let scHome = getScHomeDir(); let promptHome = getPromptHomeDir();
let lockFileName = path.join(scHome, SCLockFile); let lockFileName = path.join(promptHome, PromptLockFile);
let fd = fs.openSync(lockFileName, "w", 0o600); let fd = fs.openSync(lockFileName, "w", 0o600);
flockSync(fd, "exnb"); flockSync(fd, "exnb");
return fd; return fd;
} }
export {getScHomeDir, getDBName, acquireSCElectronLock}; export {getPromptHomeDir, getDBName, acquirePromptElectronLock};
+5 -2
View File
@@ -4,7 +4,7 @@ import * as fs from "fs";
import fetch from "node-fetch"; import fetch from "node-fetch";
import * as child_process from "node:child_process"; import * as child_process from "node:child_process";
import {debounce} from "throttle-debounce"; import {debounce} from "throttle-debounce";
import {acquireSCElectronLock} from "./base"; import {acquirePromptElectronLock} from "./base";
import {handleJsonFetchResponse} from "./util"; import {handleJsonFetchResponse} from "./util";
import * as winston from "winston"; import * as winston from "winston";
import * as util from "util"; import * as util from "util";
@@ -44,6 +44,9 @@ function log(...msg) {
} }
console.log = log; console.log = log;
console.log(sprintf("prompt-app starting, PROMPT_HOME=%s, apppath=%s arch=%s/%s", scHome, getAppBasePath(), unamePlatform, unameArch)); 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"; const DevLocalServerPath = "/Users/mike/prompt/local-server";
let localServerProc = null; let localServerProc = null;
@@ -96,7 +99,7 @@ app.setName("Prompt");
let lock : File; let lock : File;
try { try {
lock = acquireSCElectronLock(); lock = acquirePromptElectronLock();
} }
catch (e) { catch (e) {
app.exit(0); app.exit(0);