diff --git a/functions/game_settings.sh b/functions/game_settings.sh index 63d0cd37b..41923f2a0 100644 --- a/functions/game_settings.sh +++ b/functions/game_settings.sh @@ -104,6 +104,7 @@ fn_import_game_settings(){ importdir=$(echo "${gamedatadir}" | sed -e "s|${lgsmdir}/||g") #echo $importdir if [ ! -e $import ]; then + fn_check_github_files "${lgsmdir}" "${lgsmdir}/gamedata/${1}" fn_getgithubfile "${importdir}/${1}" run "gamedata/${1}" fi source $import @@ -117,7 +118,6 @@ fn_set_game_params(){ fn_update_config "${param_name}" "${param_value}" "${settingsdir}/${param_set}" "${param_comment}" } - fn_get_game_params(){ param_set=$1 param_name=$2 diff --git a/functions/install_dependency.sh b/functions/install_dependency.sh deleted file mode 100644 index 40fd2f0aa..000000000 --- a/functions/install_dependency.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# LGSM install_dependency.sh function -# Author: Jared Ballou -# Website: http://gameservermanagers.com -lgsm_version="260116" - -fn_add_game_dependency() { - # If the directory doesn't yet exist, exit the function. - # This is so that we wait until the game is installed before putting these files in place - if [ ! -e "${dependency_path}" ]; then - return - fi - - filename="${1}" - md5sum="${2}" - remote_path="dependencies/${filename}.${md5sum}" - local_path="${dependency_path}/${filename}" - local_md5="$(md5sum "${local_path}" | awk '{print $1}')" - echo "Checking ${filename} for ${md5sum}" - if [ "${local_md5}" != "${md5sum}" ]; then - fn_getgithubfile "${local_path}" 0 "${remote_path}" 1 - fi -#"${function_selfname}" == "command_install.sh" -} diff --git a/gamedata/_avalanche b/gamedata/_avalanche index e6c45852d..7fea812a4 100644 --- a/gamedata/_avalanche +++ b/gamedata/_avalanche @@ -5,7 +5,7 @@ fn_import_game_settings _default # Dependencies -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" # And the settings for defaults fn_set_game_params settings "engine" "avalanche" diff --git a/gamedata/_realvirtuality b/gamedata/_realvirtuality index c9b8ed109..8bc35c6d3 100644 --- a/gamedata/_realvirtuality +++ b/gamedata/_realvirtuality @@ -6,7 +6,7 @@ fn_import_game_settings _default # Dependencies -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" # Game settings fn_set_game_params settings "engine" "realvirtuality" diff --git a/gamedata/_seriousengine35 b/gamedata/_seriousengine35 index bc9bca79d..95a25b7e6 100644 --- a/gamedata/_seriousengine35 +++ b/gamedata/_seriousengine35 @@ -7,7 +7,7 @@ fn_import_game_settings _default # Dependencies fn_set_game_params settings "dependency_path" "${filesdir}/Bin" -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" # Game settings fn_set_game_params settings "engine" "seriousengine35" diff --git a/gamedata/_spark b/gamedata/_spark index dd0462527..ca23b268c 100644 --- a/gamedata/_spark +++ b/gamedata/_spark @@ -12,9 +12,9 @@ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser # Dependencies fn_set_game_params settings "dependency_path" "${filesdir}" -fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" -fn_add_game_dependency "libc.so.6" "7d751c7d8c061730fc5cb7317322d370 +fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libc.so.6" "7d751c7d8c061730fc5cb7317322d370 fn_set_game_params settings "configpath" "server1" fn_set_game_params settings "maxplayers" "24" diff --git a/gamedata/bsserver b/gamedata/bsserver index 18ef02e75..871685e7f 100644 --- a/gamedata/bsserver +++ b/gamedata/bsserver @@ -7,7 +7,7 @@ fn_parms(){ parms="-autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params settings "appid" "228780" fn_set_game_params settings "defaultmap" "duel_winter" diff --git a/gamedata/dabserver b/gamedata/dabserver index f4a76f358..4e52a9856 100644 --- a/gamedata/dabserver +++ b/gamedata/dabserver @@ -8,7 +8,7 @@ parms="-strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_por } fn_set_game_params settings "dependency_path" "${filesdir}" -fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" +fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" fn_set_game_params settings "appid" "317800" fn_set_game_params settings "defaultmap" "da_rooftops" diff --git a/gamedata/dstserver b/gamedata/dstserver index 6465b8b57..c1af1375d 100644 --- a/gamedata/dstserver +++ b/gamedata/dstserver @@ -8,10 +8,10 @@ parms="" } # Dependencies -fn_set_game_params settings "dependency_path" "${filesdir}/bin/lib32/" -fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" -fn_add_game_dependency "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" -fn_add_game_dependency "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" +fn_set_game_params settings "dependency_path" "${filesdir}/bin/lib32" +fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" +fn_set_game_params dependencies "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" +fn_set_game_params dependencies "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" # Game settings fn_set_game_params settings "appid" "343050" diff --git a/gamedata/fofserver b/gamedata/fofserver index 05e821276..23df1eba1 100644 --- a/gamedata/fofserver +++ b/gamedata/fofserver @@ -7,7 +7,7 @@ fn_parms(){ parms="-game fof -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } fn_set_game_params settings "dependency_path" "${filesdir}" -fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" +fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" fn_set_game_params settings "appid" "295230" fn_set_game_params settings "defaultmap" "fof_depot" diff --git a/gamedata/gmodserver b/gamedata/gmodserver index 0900d15c5..be4ec8048 100644 --- a/gamedata/gmodserver +++ b/gamedata/gmodserver @@ -8,10 +8,10 @@ fn_import_game_settings _gslt fn_import_game_settings _workshop # Add dependencies -fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" -fn_add_game_dependency "libm.so.6" "ee439d489dcbfeb12b809d9b961ffc60" -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" -fn_add_game_dependency "libc.so.6" "7d751c7d8c061730fc5cb7317322d370" +fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" +fn_set_game_params dependencies "libm.so.6" "ee439d489dcbfeb12b809d9b961ffc60" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libc.so.6" "7d751c7d8c061730fc5cb7317322d370" # Override some server settings fn_set_game_params settings "appid" "4020" diff --git a/gamedata/insserver b/gamedata/insserver index cf3315fb1..c343a19c1 100644 --- a/gamedata/insserver +++ b/gamedata/insserver @@ -6,10 +6,10 @@ fn_import_game_settings _source # Dependencies -fn_add_game_dependency "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" -fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" -fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" -fn_add_game_dependency "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" +fn_set_game_params dependencies "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" +fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" +fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" +fn_set_game_params dependencies "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" # Override some server settings fn_set_game_params settings "appid" "237410" diff --git a/gamedata/l4dserver b/gamedata/l4dserver index cbc75b776..c93c2b7cb 100644 --- a/gamedata/l4dserver +++ b/gamedata/l4dserver @@ -8,7 +8,7 @@ fn_parms(){ parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -tickrate ${tickrate} +map ${defaultmap} -maxplayers ${maxplayers}" } -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params settings "appid" "222840" fn_set_game_params settings "defaultmap" "l4d_hospital01_apartment" diff --git a/gamedata/nmrihserver b/gamedata/nmrihserver index fe0f22385..32caeff24 100644 --- a/gamedata/nmrihserver +++ b/gamedata/nmrihserver @@ -9,8 +9,8 @@ parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport # Dependencies fn_set_game_params settings "dependency_path" "${filesdir}" -fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" -fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" +fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" +fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" # Game settings fn_set_game_params settings "appid" "317670"