From dbd0081cf6304d4e8b105460ac4eeb901e42c764 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sun, 4 Feb 2024 13:44:03 +0100
Subject: [PATCH] adjusted nsis installer

---
 freedata-server-nsis-config.nsi | 11 +++++++++--
 modem/server.py                 |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/freedata-server-nsis-config.nsi b/freedata-server-nsis-config.nsi
index 11155f1e..940a0730 100644
--- a/freedata-server-nsis-config.nsi
+++ b/freedata-server-nsis-config.nsi
@@ -8,7 +8,9 @@ Name "FreeData Server"
 OutFile "FreeData-Server-Installer.exe"
 
 ; Default installation directory
-InstallDir "$PROGRAMFILES\FreeData\freedata-server"
+; InstallDir "$PROGRAMFILES\FreeData\freedata-server"
+
+InstallDir "$LOCALAPPDATA\FreeData\freedata-server"
 
 ; Registry key to store the installation directory
 InstallDirRegKey HKCU "Software\FreeData\freedata-server" "Install_Dir"
@@ -23,11 +25,16 @@ InstallDirRegKey HKCU "Software\FreeData\freedata-server" "Install_Dir"
 
 ; Define the welcome page text
 !define MUI_WELCOMEPAGE_TEXT "Welcome to the FreeData Server Setup Wizard. This wizard will guide you through the installation process."
+!define MUI_FINISHPAGE_TEXT "Folder: $INSTDIR"
+
+
+!define MUI_DIRECTORYPAGE_TEXT_TOP "Please select the installation folder. Its recommended using the suggested one for avoiding permission problems."
+
 
 ; Pages
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "LICENSE"
-!insertmacro MUI_PAGE_COMPONENTS
+;!insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
diff --git a/modem/server.py b/modem/server.py
index a2a1058e..754fd1ef 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -2,6 +2,7 @@ from flask import Flask, request, jsonify, make_response, abort, Response
 from flask_sock import Sock
 from flask_cors import CORS
 import os
+import sys
 import serial_ports
 from config import CONFIG
 import audio
@@ -39,7 +40,7 @@ def set_config():
         print(f"Using config from {config_file}")
     else:
         print(f"Config file '{config_file}' not found. Exiting.")
-        exit(1)
+        sys.exit(1)
 
     return config_file