Skip to content

Support xdg-dir spec for user.conf #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Support xdg-dir spec for user.conf #359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b283a99
Support xdg-dir spec for user.conf
saccarosium Feb 15, 2024
863903f
Merge branch 'tuxedocomputers:master' into master
saccarosium Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/e-app/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ const appPath = __dirname.replace('app.asar/', '');

const autostartLocation = path.join(os.homedir(), '.config/autostart');
const autostartDesktopFilename = 'tuxedo-control-center-tray.desktop';
const tccConfigDir = path.join(os.homedir(), '.tcc');
const homeDir = os.homedir()
const xdgConfigDir = path.join(homeDir, '.config')
const tccConfigDir = process.env.XDG_CONFIG_HOME || (fs.existsSync ? xdgConfigDir : homeDir);
const tccStandardConfigFile = path.join(tccConfigDir, 'user.conf');
const availableLanguages = [
'en',
Expand Down Expand Up @@ -160,7 +162,7 @@ async function initTray() {
tray.state.isAutostartTrayInstalled = isAutostartTrayInstalled();
tray.create();
};

tray.events.fnLockClick = (status: boolean) => {
tray.state.fnLockStatus = !status
tccDBus.setFnLockStatus(tray.state.fnLockStatus);
Expand Down Expand Up @@ -1137,7 +1139,7 @@ const aquarisHandlers = new Map<string, (...args: any[]) => any>()
aquarisStateExpected.pumpOn = false;
await updateDeviceState(aquaris, aquarisStateCurrent, aquarisStateExpected);
})

.set(ClientAPI.prototype.saveState.name, async () => {
if (await aquarisConnectedDemo()) return;
await userConfig.set('aquarisSaveState', JSON.stringify(aquarisStateCurrent));
Expand Down