From ef74a9409ea7eeedf4c6f9079146d46304481c7b Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sat, 20 Apr 2024 13:32:26 +0200 Subject: [PATCH] adjusted appimage path --- .github/workflows/build_appimage_bundle.yml | 6 ++---- freedata_gui/electron/main/index.ts | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_appimage_bundle.yml b/.github/workflows/build_appimage_bundle.yml index 0058a906..1153345a 100644 --- a/.github/workflows/build_appimage_bundle.yml +++ b/.github/workflows/build_appimage_bundle.yml @@ -88,11 +88,9 @@ jobs: cp ./server/config.ini $SERVER_CONFIG_FILE fi - # Launch the server - echo "Starting freedata-server" - + echo "Setting server config variable" export FREEDATA_CONFIG=$SERVER_CONFIG_FILE - ./server/freedata-server + # ./server/freedata-server # Launch the gui echo "Starting gui" diff --git a/freedata_gui/electron/main/index.ts b/freedata_gui/electron/main/index.ts index cb941bee..96e8642e 100644 --- a/freedata_gui/electron/main/index.ts +++ b/freedata_gui/electron/main/index.ts @@ -112,8 +112,10 @@ app.whenReady().then(() => { //serverProcess.unref(); // Allow the server process to continue running independently of the parent process // break; case "linux": - serverPath = join(basePath, "server.dist", "freedata-server"); + serverPath = join(basePath, "server", "freedata-server"); + //process.env.FREEDATA_CONFIG = '~/.config/FreeDATA/config.ini'; console.log(`Starting server with path: ${serverPath}`); + serverProcess = spawn(serverPath, [], { detached: true }); serverProcess.unref(); // Allow the server process to continue running independently of the parent process break;