Browse Source

Merge remote-tracking branch 'upstream/master' into config-select

pull/372/head
Ilija Matoski 10 years ago
parent
commit
c981c7fe84
  1. 7
      Arma3/arma3server
  2. 8
      functions/fn_start

7
Arma3/arma3server

@ -4,7 +4,7 @@
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Contributor: Scarsz # Contributor: Scarsz
# Website: http://danielgibbs.co.uk # Website: http://danielgibbs.co.uk
# Version: 200315 # Version: 240415
#### Variables #### #### Variables ####
@ -27,7 +27,7 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
#### Advanced Variables #### #### Advanced Variables ####
# ARMA 3 Modules # ARMA 3 Modules
# add mods with relative paths: # add mods with relative paths:
# mods/\@CBA_A3\; # mods/\@CBA_A3\;
# or several mods as: # or several mods as:
# mods/\@CBA_A3\;mods/\@task_force_radio # mods/\@CBA_A3\;mods/\@task_force_radio
@ -35,7 +35,10 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
mods="" mods=""
# Steam # Steam
# Stable
appid="233780" appid="233780"
# Development
# appid="233780 -beta development"
# Server Details # Server Details
servicename="arma3-server" servicename="arma3-server"

8
functions/fn_start

@ -166,10 +166,10 @@ if [ "${tmuxwc}" -eq 0 ]; then
fn_scriptlog "http://gameservermanagers.com/issues" fn_scriptlog "http://gameservermanagers.com/issues"
fi fi
fi fi
else
fn_printok "${servername}"
fn_scriptlog "Started ${servername}"
fi fi
else
fn_printok "${servername}"
fn_scriptlog "Started ${servername}"
fi fi
#rm "${scriptlogdir}/.${servicename}-tmux-error.tmp" #rm "${scriptlogdir}/.${servicename}-tmux-error.tmp"
echo -en "\n" echo -en "\n"
@ -179,4 +179,4 @@ if [ "${gamename}" == "Teamspeak 3" ]; then
fn_start_teamspeak3 fn_start_teamspeak3
else else
fn_start_tmux fn_start_tmux
fi fi

Loading…
Cancel
Save