gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merged hotfix/ultimatebyte-121 into master

pull/1247/head 170110.1
Daniel Gibbs 8 years ago
parent
96ac2b6560 a300a15df2
commit
3ec3659647
16 changed files with 31 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      7DaysToDie/sdtdserver
  2. 2
      Arma3/arma3server
  3. 2
      BladeSymphony/bsserver
  4. 2
      BrainBread2/bb2server
  5. 4
      KillingFloor/kfserver
  6. 4
      NS2Combat/ns2cserver
  7. 4
      NaturalSelection2/ns2server
  8. 4
      RedOrchestra/roserver
  9. 4
      Ricochet/ricochetserver
  10. 4
      Starbound/sbserver
  11. 4
      Teeworlds/twserver
  12. 4
      Terraria/terrariaserver
  13. 4
      lgsm/functions/check_steamcmd.sh
  14. 6
      lgsm/functions/command_validate.sh
  15. 10
      lgsm/functions/install_server_files.sh
  16. 6
      lgsm/functions/update_steamcmd.sh

2
7DaysToDie/sdtdserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"

2
Arma3/arma3server
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"

2
BladeSymphony/bsserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="duel_winter" defaultmap="duel_winter"

2
BrainBread2/bb2server
View File

@ -23,7 +23,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
# Steam login # Steam login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="bba_barracks" defaultmap="bba_barracks"

4
KillingFloor/kfserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="KF-BioticsLab.rom" defaultmap="KF-BioticsLab.rom"
@ -203,4 +203,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
NS2Combat/ns2cserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="co_core" defaultmap="co_core"
@ -208,4 +208,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
NaturalSelection2/ns2server
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="ns2_summit" defaultmap="ns2_summit"
@ -208,4 +208,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
RedOrchestra/roserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
defaultmap="RO-Arad.rom" defaultmap="RO-Arad.rom"
@ -205,4 +205,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
Ricochet/ricochetserver
View File

@ -41,10 +41,6 @@ parms="-game ricochet -strictportbind +ip ${ip} -port ${port} +clientport ${clie
#### Server Settings #### #### Server Settings ####
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username"
steampass="password"
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"

4
Starbound/sbserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"
@ -197,4 +197,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
Teeworlds/twserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"
@ -198,4 +198,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
Terraria/terrariaserver
View File

@ -24,7 +24,7 @@ version="170110"
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login ## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
steamuser="username" steamuser="username"
steampass="password" steampass='password'
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
ip="0.0.0.0" ip="0.0.0.0"
@ -197,4 +197,4 @@ fi
core_dl.sh core_dl.sh
core_functions.sh core_functions.sh
getopt=$1 getopt=$1
core_getopt.sh core_getopt.sh

4
lgsm/functions/check_steamcmd.sh
View File

@ -31,7 +31,7 @@ fn_check_steamcmd_user(){
fn_script_log_info "Using anonymous Steam login." fn_script_log_info "Using anonymous Steam login."
fi fi
steamuser="anonymous" steamuser="anonymous"
steampass="" steampass=''
sleep 1 sleep 1
fi fi
} }
@ -58,7 +58,7 @@ fn_check_steamcmd_sh(){
fn_check_steamcmd_guard(){ fn_check_steamcmd_guard(){
if [ "${function_selfname}" == "command_update.sh" ]||[ "${function_selfname}" == "command_validate.sh" ]; then if [ "${function_selfname}" == "command_update.sh" ]||[ "${function_selfname}" == "command_validate.sh" ]; then
# Checks that SteamCMD is working correctly and will prompt Steam Guard if required. # Checks that SteamCMD is working correctly and will prompt Steam Guard if required.
"${steamcmddir}"/steamcmd.sh +login "${steamuser}" '${steampass}' +quit "${steamcmddir}"/steamcmd.sh +login "${steamuser}" "${steampass}" +quit
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fn_print_failure_nl "Error running SteamCMD" fn_print_failure_nl "Error running SteamCMD"
fi fi

6
lgsm/functions/command_validate.sh
View File

@ -24,9 +24,9 @@ fn_validation(){
fi fi
if [ "${engine}" == "goldsource" ]; then if [ "${engine}" == "goldsource" ]; then
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}" ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}"
else else
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}" ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}"
fi fi
if [ $? != 0 ]; then if [ $? != 0 ]; then
fn_print_fail_nl "Validating files: SteamCMD" fn_print_fail_nl "Validating files: SteamCMD"
@ -54,4 +54,4 @@ if [ "${status}" != "0" ]; then
else else
fn_validation fn_validation
fi fi
core_exit.sh core_exit.sh

10
lgsm/functions/install_server_files.sh
View File

@ -78,18 +78,18 @@ fn_install_server_files_steamcmd(){
if [ "${counter}" -le "4" ]; then if [ "${counter}" -le "4" ]; then
if [ "${engine}" == "goldsource" ]; then if [ "${engine}" == "goldsource" ]; then
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit
local exitcode=$? local exitcode=$?
else else
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit
local exitcode=$? local exitcode=$?
fi fi
elif [ "${counter}" -ge "5" ]; then elif [ "${counter}" -ge "5" ]; then
if [ "${engine}" == "goldsource" ]; then if [ "${engine}" == "goldsource" ]; then
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} -validate +quit ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} -validate +quit
local exitcode=$? local exitcode=$?
else else
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} -validate +quit ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} -validate +quit
local exitcode=$? local exitcode=$?
fi fi
fi fi
@ -107,7 +107,7 @@ fn_install_server_files_steamcmd(){
counter="0" counter="0"
while [ "${counter}" -le "4" ]; do while [ "${counter}" -le "4" ]; do
counter=$((counter+1)) counter=$((counter+1))
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} -validate +quit ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} -validate +quit
local exitcode=$? local exitcode=$?
done done
fi fi

6
lgsm/functions/update_steamcmd.sh
View File

@ -26,9 +26,9 @@ fn_update_steamcmd_dl(){
fi fi
if [ "${engine}" == "goldsource" ]; then if [ "${engine}" == "goldsource" ]; then
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}" ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}"
else else
${unbuffer} ./steamcmd.sh +login "${steamuser}" '${steampass}' +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}" ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}"
fi fi
fix.sh fix.sh
@ -156,7 +156,7 @@ fn_update_steamcmd_check(){
fi fi
# Gets availablebuild info # Gets availablebuild info
availablebuild=$(./steamcmd.sh +login "${steamuser}" '${steampass}' +app_info_update 1 +app_info_print "${appid}" +app_info_print "${appid}" +quit | grep -EA 1000 "^\s+\"branches\"$" | grep -EA 5 "^\s+\"${branchname}\"$" | grep -m 1 -EB 10 "^\s+}$" | grep -E "^\s+\"buildid\"\s+" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\ -f3) availablebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +app_info_print "${appid}" +quit | grep -EA 1000 "^\s+\"branches\"$" | grep -EA 5 "^\s+\"${branchname}\"$" | grep -m 1 -EB 10 "^\s+}$" | grep -E "^\s+\"buildid\"\s+" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\ -f3)
if [ -z "${availablebuild}" ]; then if [ -z "${availablebuild}" ]; then
fn_print_fail "Checking for update: SteamCMD" fn_print_fail "Checking for update: SteamCMD"
sleep 1 sleep 1

Write Preview
Loading…
Cancel
Save