From 43a85938b8e43742c0a63b029124edf91827edd2 Mon Sep 17 00:00:00 2001
From: Ingo Reitz <9l@9lo.re>
Date: Fri, 30 Aug 2024 18:43:09 +0200
Subject: [PATCH] fix config file, SPDX ID, bump version fixes Config file
 doesn't work #27

---
 Arma3Helper.sh |  8 +++++---
 config         | 13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Arma3Helper.sh b/Arma3Helper.sh
index 321d77f..2e60fb3 100755
--- a/Arma3Helper.sh
+++ b/Arma3Helper.sh
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 
-# Licensed under GNU GPL 2.0 by Ingo "ninelore" Reitz <ninelore@protonmail.com>
+# SPDX-License-Identifier: GPL-2.0
 # 
+# Author: Ingo Reitz <9l@9lo.re>
 # Contributing:	famfo (famfo#0227)
 # Testing:		G4rrus#3755 
 # 
-# Version 1v18-6
-_SCRIPTVER="1v18-6"
+# Version 1v18-7
+_SCRIPTVER="1v18-7"
 
 #####################################################################################
 ## Adjust below or use the external config file
@@ -55,6 +56,7 @@ else
 fi
 if [[ -e "$USERCONFIG/config" ]]; then
 	echo "Config file $USERCONFIG/config found. Using its values."
+	# shellcheck source=/dev/null
 	source "$USERCONFIG/config"
 fi
 
diff --git a/config b/config
index ef15951..d78847d 100644
--- a/config
+++ b/config
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-2.0
 
 #####################################################################################
 ## Arma3helper.sh CONFIG FILE (This will override settings made in Arma3Helper.sh) 
@@ -8,22 +9,22 @@
 # Set this to the Proton Version you are using with Arma!
 # Available versions: "8.0", "7.0", "6.3", "5.13", "5.0", "4.11", "4.2", "3.16", "3.7", "Proton Experimental", "Experimental"
 # Defaults to: 8.0
-PROTON_OFFICIAL_VERSION=""
+export PROTON_OFFICIAL_VERSION=""
 
 ## Path to Arma's compatdata (wineprefix)
 # Leave empty if Arma is installed in Steams default library
-COMPAT_DATA_PATH=""
+export COMPAT_DATA_PATH=""
 
 # If you have proton in a different steam library, then put the path to its steamapps folder here
 # Leave empty if Proton is installed in Steams default library
-STEAM_LIBRARY_PATH=""
+export STEAM_LIBRARY_PATH=""
 
 # If you are using a custom proton build, then put its folder name (from inside compatibilitytools.d) here
 # Leave empty if proton 
-PROTON_CUSTOM_VERSION=""
+export PROTON_CUSTOM_VERSION=""
 
 ## Esync/Fsync
 # IMPORTANT: Make sure that Esync and Fsync settings MATCH for both Arma and TeamSpeak(here)
 # If you havent explicitly turned it off for Arma, leave it on here!
-ESYNC=true
-FSYNC=true
+export ESYNC=true
+export FSYNC=true