Browse Source

Updated parms and defaults to fix lock issue, parameters now parse

pull/525/head
Jared Ballou 9 years ago
parent
commit
d26dddacd5
  1. 2
      functions/game_settings.sh
  2. 2
      gamedata/_default
  3. 3
      gamedata/_parms_plusminus

2
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 the line isn't the same as the parsed data line, replace it
if [ "${exists}" != "${data}" ]; then if [ "${exists}" != "${data}" ]; then
#echo "Updating ${data} in ${cfg_file}" #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 #sed "/${key}=.*/${data}/" -i $cfg_file
fi fi
else else

2
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 "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 "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 "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 "logdays" "7" "Number of days to retain logs"
fn_set_game_params settings "maxplayers" "--EMPTY--" "Maximum player count" fn_set_game_params settings "maxplayers" "--EMPTY--" "Maximum player count"
fn_set_game_params settings "port" "--EMPTY--" "Port to bind for server" fn_set_game_params settings "port" "--EMPTY--" "Port to bind for server"

3
gamedata/_parms_plusminus

@ -6,6 +6,5 @@
fn_parms(){ fn_parms(){
parms_minus="$(echo $(sed -e 's/^\([^#=]\+\)=\"/\-\1 /g' -e 's/\"$//g' ${settingsdir}/parms_minus))" 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_plus="$(echo $(sed -e 's/^\([^#=]\+\)=\"/\+\1 /g' -e 's/\"$//g' ${settingsdir}/parms_plus))"
parms_list="${parms_minus} ${server_parms} ${parms_plus}" parms="$(eval "echo \"${parms_minus} ${server_parms} ${parms_plus}\"")"
parms="$(eval "${parms_list}")"
} }

Loading…
Cancel
Save