From d26dddacd5fe70f8a72b7aecb73e65932617d5eb Mon Sep 17 00:00:00 2001
From: Jared Ballou <github@jballou.com>
Date: Tue, 19 Jan 2016 13:31:29 -0500
Subject: [PATCH] Updated parms and defaults to fix lock issue, parameters now
 parse

---
 functions/game_settings.sh | 2 +-
 gamedata/_default          | 2 +-
 gamedata/_parms_plusminus  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/functions/game_settings.sh b/functions/game_settings.sh
index 9da3863dd..74af87f93 100644
--- a/functions/game_settings.sh
+++ b/functions/game_settings.sh
@@ -61,7 +61,7 @@ fn_update_config()
 		# If the line isn't the same as the parsed data line, replace it
 		if [ "${exists}" != "${data}" ]; then
 			#echo "Updating ${data} in ${cfg_file}"
-			sed -e "s/^${key}=.*\$/${data}/g" -i $cfg_file
+			sed -e "s%^${key}=.*\$%${data}%g" -i $cfg_file
 			#sed "/${key}=.*/${data}/" -i $cfg_file
 		fi
 	else
diff --git a/gamedata/_default b/gamedata/_default
index e5af7dced..f179cd9a0 100644
--- a/gamedata/_default
+++ b/gamedata/_default
@@ -17,7 +17,7 @@ fn_set_game_params settings "game" "--EMPTY--" "Name of game"
 fn_set_game_params settings "gamename" "--EMPTY--" "Name for subdirectory in GitHub repo"
 fn_set_game_params settings "ip" "0.0.0.0" "IP Address to bind for server"
 fn_set_game_params settings "lgsm_version" "${version}" "Version of LGSM that created this config"
-fn_set_game_params settings "lockselfname" "\${lgsmdir}/.\${servicename}.lock" "LGSM Lock File"
+fn_set_game_params settings "lockselfname" ".\${servicename}.lock" "LGSM Lock File"
 fn_set_game_params settings "logdays" "7" "Number of days to retain logs"
 fn_set_game_params settings "maxplayers" "--EMPTY--" "Maximum player count"
 fn_set_game_params settings "port" "--EMPTY--" "Port to bind for server"
diff --git a/gamedata/_parms_plusminus b/gamedata/_parms_plusminus
index 58514c8ac..7569e86f4 100644
--- a/gamedata/_parms_plusminus
+++ b/gamedata/_parms_plusminus
@@ -6,6 +6,5 @@
 fn_parms(){
 	parms_minus="$(echo $(sed -e 's/^\([^#=]\+\)=\"/\-\1 /g' -e 's/\"$//g' ${settingsdir}/parms_minus))"
 	parms_plus="$(echo $(sed -e 's/^\([^#=]\+\)=\"/\+\1 /g' -e 's/\"$//g' ${settingsdir}/parms_plus))"
-	parms_list="${parms_minus} ${server_parms} ${parms_plus}"
-	parms="$(eval "${parms_list}")"
+	parms="$(eval "echo \"${parms_minus} ${server_parms} ${parms_plus}\"")"
 }