GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-08-18 23:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed startup event oder - fixes #6511

Browse Source
This commit is contained in:
Eugene Pankov
2022-05-30 23:27:01 +02:00
parent b3df681753
commit 7437aaffcf
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/lib/config.ts
View File

@@ -6,28 +6,29 @@ import * as gracefulFS from 'graceful-fs'
import { app } from 'electron'
import { promisify } from 'util'
export async function migrateConfig (): Promise<void> {
export function migrateConfig (): void {
const configPath = path.join(app.getPath('userData'), 'config.yaml')
const legacyConfigPath = path.join(app.getPath('userData'), '../terminus', 'config.yaml')
if (await fs.exists(legacyConfigPath) && (
!await fs.exists(configPath) ||
(await fs.stat(configPath)).mtime < (await fs.stat(legacyConfigPath)).mtime
if (fs.existsSync(legacyConfigPath) && (
!fs.existsSync(configPath) ||
fs.statSync(configPath).mtime < fs.statSync(legacyConfigPath).mtime
)) {
await fs.writeFile(configPath, await fs.readFile(legacyConfigPath))
fs.writeFileSync(configPath, fs.readFileSync(legacyConfigPath))
}
}
export async function loadConfig (): Promise<any> {
await migrateConfig()
export function loadConfig (): any {
migrateConfig()
const configPath = path.join(app.getPath('userData'), 'config.yaml')
if (await fs.exists(configPath)) {
return yaml.load(await fs.readFile(configPath, 'utf8'))
if (fs.existsSync(configPath)) {
return yaml.load(fs.readFileSync(configPath, 'utf8'))
} else {
return {}
}
}
const configPath = path.join(app.getPath('userData'), 'config.yaml')
let _configSaveInProgress = Promise.resolve()