Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 10:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-fix-gui-tests' into dev-fix-gui-tests

Browse source
This commit is contained in:
DJ2LS 2024-01-23 19:12:10 +01:00
parent f4de64d3be 53a34eaaa2
commit 90b0ff06e1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/src/js/freedata.ts
View file

@ -105,8 +105,8 @@ export function getAppDataPath() {
const platform = os.platform(); const platform = os.platform();
let appDataPath; let appDataPath;
// Check if running in GitHub Actions // Check if running in GitHub Actions
const isGitHubActions = process.env.GITHUB_ACTIONS === 'true'; const isGitHubActions = process.env.GITHUB_ACTIONS === "true";
if (isGitHubActions) { if (isGitHubActions) {
return "/home/runner/work/FreeDATA/FreeDATA/gui/config"; return "/home/runner/work/FreeDATA/FreeDATA/gui/config";
} }

8
gui/src/store/settingsStore.js
View file

@ -7,12 +7,12 @@ const nconf = require("nconf");
var appDataPath = getAppDataPath(); var appDataPath = getAppDataPath();
var configFolder = path.join(appDataPath, "FreeDATA"); var configFolder = path.join(appDataPath, "FreeDATA");
let configFile = "config.json" let configFile = "config.json";
const isGitHubActions = process.env.GITHUB_ACTIONS === 'true'; const isGitHubActions = process.env.GITHUB_ACTIONS === "true";
if (isGitHubActions) { if (isGitHubActions) {
configFile = "example.json"; configFile = "example.json";
configFolder = appDataPath; configFolder = appDataPath;
} }
var configPath = path.join(configFolder, configFile); var configPath = path.join(configFolder, configFile);