Browse Source

Removed fn_add_game_dependency and using settings.tmp/dependencies file to track dependencies now

pull/553/head
Jared Ballou 10 years ago
parent
commit
5eb17b6008
  1. 2
      functions/game_settings.sh
  2. 24
      functions/install_dependency.sh
  3. 2
      gamedata/_avalanche
  4. 2
      gamedata/_realvirtuality
  5. 2
      gamedata/_seriousengine35
  6. 6
      gamedata/_spark
  7. 2
      gamedata/bsserver
  8. 2
      gamedata/dabserver
  9. 8
      gamedata/dstserver
  10. 2
      gamedata/fofserver
  11. 8
      gamedata/gmodserver
  12. 8
      gamedata/insserver
  13. 2
      gamedata/l4dserver
  14. 4
      gamedata/nmrihserver

2
functions/game_settings.sh

@ -104,6 +104,7 @@ fn_import_game_settings(){
importdir=$(echo "${gamedatadir}" | sed -e "s|${lgsmdir}/||g") importdir=$(echo "${gamedatadir}" | sed -e "s|${lgsmdir}/||g")
#echo $importdir #echo $importdir
if [ ! -e $import ]; then if [ ! -e $import ]; then
fn_check_github_files "${lgsmdir}" "${lgsmdir}/gamedata/${1}"
fn_getgithubfile "${importdir}/${1}" run "gamedata/${1}" fn_getgithubfile "${importdir}/${1}" run "gamedata/${1}"
fi fi
source $import source $import
@ -117,7 +118,6 @@ fn_set_game_params(){
fn_update_config "${param_name}" "${param_value}" "${settingsdir}/${param_set}" "${param_comment}" fn_update_config "${param_name}" "${param_value}" "${settingsdir}/${param_set}" "${param_comment}"
} }
fn_get_game_params(){ fn_get_game_params(){
param_set=$1 param_set=$1
param_name=$2 param_name=$2

24
functions/install_dependency.sh

@ -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"
}

2
gamedata/_avalanche

@ -5,7 +5,7 @@
fn_import_game_settings _default fn_import_game_settings _default
# Dependencies # Dependencies
fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
# And the settings for defaults # And the settings for defaults
fn_set_game_params settings "engine" "avalanche" fn_set_game_params settings "engine" "avalanche"

2
gamedata/_realvirtuality

@ -6,7 +6,7 @@
fn_import_game_settings _default fn_import_game_settings _default
# Dependencies # Dependencies
fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
# Game settings # Game settings
fn_set_game_params settings "engine" "realvirtuality" fn_set_game_params settings "engine" "realvirtuality"

2
gamedata/_seriousengine35

@ -7,7 +7,7 @@ fn_import_game_settings _default
# Dependencies # Dependencies
fn_set_game_params settings "dependency_path" "${filesdir}/Bin" 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 # Game settings
fn_set_game_params settings "engine" "seriousengine35" fn_set_game_params settings "engine" "seriousengine35"

6
gamedata/_spark

@ -12,9 +12,9 @@ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser
# Dependencies # Dependencies
fn_set_game_params settings "dependency_path" "${filesdir}" 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_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
fn_add_game_dependency "libc.so.6" "7d751c7d8c061730fc5cb7317322d370 fn_set_game_params dependencies "libc.so.6" "7d751c7d8c061730fc5cb7317322d370
fn_set_game_params settings "configpath" "server1" fn_set_game_params settings "configpath" "server1"
fn_set_game_params settings "maxplayers" "24" fn_set_game_params settings "maxplayers" "24"

2
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}" 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 "appid" "228780"
fn_set_game_params settings "defaultmap" "duel_winter" fn_set_game_params settings "defaultmap" "duel_winter"

2
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_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 "appid" "317800"
fn_set_game_params settings "defaultmap" "da_rooftops" fn_set_game_params settings "defaultmap" "da_rooftops"

8
gamedata/dstserver

@ -8,10 +8,10 @@ parms=""
} }
# Dependencies # Dependencies
fn_set_game_params settings "dependency_path" "${filesdir}/bin/lib32/" fn_set_game_params settings "dependency_path" "${filesdir}/bin/lib32"
fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60"
fn_add_game_dependency "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" fn_set_game_params dependencies "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca"
fn_add_game_dependency "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" fn_set_game_params dependencies "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e"
# Game settings # Game settings
fn_set_game_params settings "appid" "343050" fn_set_game_params settings "appid" "343050"

2
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}" 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_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 "appid" "295230"
fn_set_game_params settings "defaultmap" "fof_depot" fn_set_game_params settings "defaultmap" "fof_depot"

8
gamedata/gmodserver

@ -8,10 +8,10 @@ fn_import_game_settings _gslt
fn_import_game_settings _workshop fn_import_game_settings _workshop
# Add dependencies # Add dependencies
fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60"
fn_add_game_dependency "libm.so.6" "ee439d489dcbfeb12b809d9b961ffc60" fn_set_game_params dependencies "libm.so.6" "ee439d489dcbfeb12b809d9b961ffc60"
fn_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
fn_add_game_dependency "libc.so.6" "7d751c7d8c061730fc5cb7317322d370" fn_set_game_params dependencies "libc.so.6" "7d751c7d8c061730fc5cb7317322d370"
# Override some server settings # Override some server settings
fn_set_game_params settings "appid" "4020" fn_set_game_params settings "appid" "4020"

8
gamedata/insserver

@ -6,10 +6,10 @@
fn_import_game_settings _source fn_import_game_settings _source
# Dependencies # Dependencies
fn_add_game_dependency "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e" fn_set_game_params dependencies "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e"
fn_add_game_dependency "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c" fn_set_game_params dependencies "libm.so.6" "b6fef88fd045bfcd05fd4036f323855c"
fn_add_game_dependency "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60" fn_set_game_params dependencies "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60"
fn_add_game_dependency "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca" fn_set_game_params dependencies "librt.so.1" "eabf0fc1f81292270343bd0796fc64ca"
# Override some server settings # Override some server settings
fn_set_game_params settings "appid" "237410" fn_set_game_params settings "appid" "237410"

2
gamedata/l4dserver

@ -8,7 +8,7 @@ fn_parms(){
parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -tickrate ${tickrate} +map ${defaultmap} -maxplayers ${maxplayers}" 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 "appid" "222840"
fn_set_game_params settings "defaultmap" "l4d_hospital01_apartment" fn_set_game_params settings "defaultmap" "l4d_hospital01_apartment"

4
gamedata/nmrihserver

@ -9,8 +9,8 @@ parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport
# Dependencies # Dependencies
fn_set_game_params settings "dependency_path" "${filesdir}" 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_add_game_dependency "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f" fn_set_game_params dependencies "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
# Game settings # Game settings
fn_set_game_params settings "appid" "317670" fn_set_game_params settings "appid" "317670"

Loading…
Cancel
Save