Browse Source

Merge remote-tracking branch 'refs/remotes/origin/master' into development

pull/1097/head
Daniel Gibbs 9 years ago
parent
commit
965bfac1d9
  1. 4
      NaturalSelection2/ns2server
  2. 1
      lgsm/functions/command_fastdl.sh

4
NaturalSelection2/ns2server

@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="220416" version="210916"
#### Variables #### #### Variables ####
@ -48,7 +48,7 @@ password=""
# http://wiki.unknownworlds.com/ns2/Dedicated_Server # http://wiki.unknownworlds.com/ns2/Dedicated_Server
fn_parms(){ fn_parms(){
parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\"" parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
} }
#### Advanced Variables #### #### Advanced Variables ####

1
lgsm/functions/command_fastdl.sh

@ -160,6 +160,7 @@ fn_gmod_fastdl(){
fn_script_log "Copying map files" fn_script_log "Copying map files"
sleep 0.5 sleep 0.5
find . -name '*.bsp' | cpio --quiet -updm "${fastdldir}" find . -name '*.bsp' | cpio --quiet -updm "${fastdldir}"
find . -name '*.ain' | cpio --quiet -updm "${fastdldir}"
fn_print_ok "Map files copied" fn_print_ok "Map files copied"
sleep 0.5 sleep 0.5
echo -en "\n" echo -en "\n"

Loading…
Cancel
Save